public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bash5: remove patch w/musl

Browse Source 
Leave the configureFlags, esp disabling bash malloc.
This commit is contained in:
Will Dietz 2019-01-08 00:18:48 -06:00
parent 844bd53740
commit fa00f7fb70
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/shells/bash/5.0.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildPackages { stdenv, buildPackages
, fetchurl, binutils ? null, bison, autoconf, utillinux , fetchurl, binutils ? null, bison, utillinux
# patch for cygwin requires readline support # patch for cygwin requires readline support
, interactive ? stdenv.isCygwin, readline80 ? null , interactive ? stdenv.isCygwin, readline80 ? null
@ -44,12 +44,7 @@ stdenv.mkDerivation rec {
patchFlags = "-p0"; patchFlags = "-p0";
patches = upstreamPatches patches = upstreamPatches
++ optional stdenv.hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch ++ 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";
});
configureFlags = [ configureFlags = [
(if interactive then "--with-installed-readline" else "--disable-readline") (if interactive then "--with-installed-readline" else "--disable-readline")
@ -73,8 +68,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison ] nativeBuildInputs = [ bison ]
++ optional withDocs texinfo ++ optional withDocs texinfo
++ optional stdenv.hostPlatform.isDarwin binutils ++ optional stdenv.hostPlatform.isDarwin binutils;
++ optional (stdenv.hostPlatform.libc == "musl") autoconf;
buildInputs = optional interactive readline80; buildInputs = optional interactive readline80;