BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dash: move confusing comment

Browse source 
When the noexec patch was added, this comment should have been moved
to make it clear it referred to the Darwin patch, which was previously
the only one.
This commit is contained in:
Alyssa Ross 2021-04-04 18:49:00 +00:00
parent 0874169a0c
commit ac6d98dbdc
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/shells/dash/default.nix
View file

@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# Temporary fix until a proper one is accepted upstream
patches = [
(fetchurl {
# Dash executes code when noexec ("-n") is specified
@ -19,7 +18,11 @@ stdenv.mkDerivation rec {
url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5";
})
] ++ lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch;
] ++ lib.optionals stdenv.isDarwin [
# Temporary fix until a proper one is accepted upstream
./0001-fix-dirent64-et-al-on-darwin.patch
];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;