From e049b8591006db58f34d41a490725a510191a238 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 Jan 2023 11:55:24 +0000 Subject: [PATCH] bash: apply static fix unconditionally To ease maintenance. --- pkgs/shells/bash/5.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 7735243d3bab..7b79533cc3a0 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")