diff options
| author | Will Dietz <w@wdtz.org> | 2019-01-08 00:18:48 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-01-08 17:35:28 -0600 |
| commit | fa00f7fb705449f51e44776a1e79597caa1e799b (patch) | |
| tree | 7be2faf6e8918d4451f6c88ea11bff9b6ffadf66 /pkgs/shells/bash/5.0.nix | |
| parent | 844bd5374057404ecea6cfbf3b92b89507240432 (diff) | |
| download | nixpkgs-fa00f7fb705449f51e44776a1e79597caa1e799b.tar nixpkgs-fa00f7fb705449f51e44776a1e79597caa1e799b.tar.gz nixpkgs-fa00f7fb705449f51e44776a1e79597caa1e799b.tar.bz2 nixpkgs-fa00f7fb705449f51e44776a1e79597caa1e799b.tar.lz nixpkgs-fa00f7fb705449f51e44776a1e79597caa1e799b.tar.xz nixpkgs-fa00f7fb705449f51e44776a1e79597caa1e799b.tar.zst nixpkgs-fa00f7fb705449f51e44776a1e79597caa1e799b.zip | |
bash5: remove patch w/musl
Leave the configureFlags, esp disabling bash malloc.
Diffstat (limited to 'pkgs/shells/bash/5.0.nix')
| -rw-r--r-- | pkgs/shells/bash/5.0.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix index e36259c2496..7aee7745ec7 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.0.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, binutils ? null, bison, autoconf, utillinux +, fetchurl, binutils ? null, bison, utillinux # patch for cygwin requires readline support , interactive ? stdenv.isCygwin, readline80 ? null @@ -44,12 +44,7 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; patches = upstreamPatches - ++ optional stdenv.hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch - # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html - ++ optional stdenv.hostPlatform.isMusl (fetchurl { - url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch"; - sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1"; - }); + ++ optional stdenv.hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") @@ -73,8 +68,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ] ++ optional withDocs texinfo - ++ optional stdenv.hostPlatform.isDarwin binutils - ++ optional (stdenv.hostPlatform.libc == "musl") autoconf; + ++ optional stdenv.hostPlatform.isDarwin binutils; buildInputs = optional interactive readline80; |