From 3d770c1aa563923be9c1dabc5b11963c0cb3f528 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 4 May 2021 19:30:16 +0200 Subject: libnixxml: patch /bin/bash path --- pkgs/development/libraries/libnixxml/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 62440487e0f..48edfbfce2c 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}: stdenv.mkDerivation { pname = "libnixxml"; @@ -11,11 +11,15 @@ stdenv.mkDerivation { sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; - postPatch = '' + prePatch = '' # Remove broken test substituteInPlace tests/draw/Makefile.am \ --replace "draw-wrong.sh" "" rm tests/draw/draw-wrong.sh + + # Fix bash path + substituteInPlace scripts/nixexpr2xml.in \ + --replace "/bin/bash" "${bash}/bin/bash" ''; preAutoreconf = '' @@ -35,6 +39,7 @@ stdenv.mkDerivation { libxslt ]; buildInputs = [ + bash libxml2 gd.dev glib -- cgit 1.4.1