diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-04 18:49:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-04 22:07:15 +0000 |
| commit | ac6d98dbdcd5536f6ed6f68987280ff99d64813d (patch) | |
| tree | 85cb21b037ac1d328e3d1314ccb10172a2365c6e /pkgs/shells/dash | |
| parent | 0874169a0c73e4393e45f18ef1e278d3c6f5bd2c (diff) | |
| download | nixpkgs-ac6d98dbdcd5536f6ed6f68987280ff99d64813d.tar nixpkgs-ac6d98dbdcd5536f6ed6f68987280ff99d64813d.tar.gz nixpkgs-ac6d98dbdcd5536f6ed6f68987280ff99d64813d.tar.bz2 nixpkgs-ac6d98dbdcd5536f6ed6f68987280ff99d64813d.tar.lz nixpkgs-ac6d98dbdcd5536f6ed6f68987280ff99d64813d.tar.xz nixpkgs-ac6d98dbdcd5536f6ed6f68987280ff99d64813d.tar.zst nixpkgs-ac6d98dbdcd5536f6ed6f68987280ff99d64813d.zip | |
dash: move confusing comment
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.
Diffstat (limited to 'pkgs/shells/dash')
| -rw-r--r-- | pkgs/shells/dash/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 24d5af7e74e..d6b99e0361e 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -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; |