diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-01-23 11:55:24 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-01-23 15:59:25 +0000 |
| commit | e049b8591006db58f34d41a490725a510191a238 (patch) | |
| tree | bbec45f84e72ae1ec1e3494461e617549cae85cd /pkgs/shells/bash | |
| parent | b2840f46676ecfbab5b41f0af086ed71d2adc137 (diff) | |
| download | nixpkgs-e049b8591006db58f34d41a490725a510191a238.tar nixpkgs-e049b8591006db58f34d41a490725a510191a238.tar.gz nixpkgs-e049b8591006db58f34d41a490725a510191a238.tar.bz2 nixpkgs-e049b8591006db58f34d41a490725a510191a238.tar.lz nixpkgs-e049b8591006db58f34d41a490725a510191a238.tar.xz nixpkgs-e049b8591006db58f34d41a490725a510191a238.tar.zst nixpkgs-e049b8591006db58f34d41a490725a510191a238.zip | |
bash: apply static fix unconditionally
To ease maintenance.
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/5.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 7735243d3ba..7b79533cc3a 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -50,13 +50,14 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - patches = upstreamPatches - ++ [ ./pgrp-pipe-5.patch ] - ++ lib.optional stdenv.hostPlatform.isStatic (fetchurl { + patches = upstreamPatches ++ [ + ./pgrp-pipe-5.patch + (fetchurl { name = "fix-static.patch"; url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51"; sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk="; - }); + }) + ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") |