cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

groff: get rid buildtime bash reference and enable strictDeps

Browse source 
verified the changes with diffoscope
This commit is contained in:
Artturin 2022-04-20 03:12:13 +03:00
parent 7e3e1ffd93
commit c7b6852cad
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/text/groff/default.nix
View file

@ -5,6 +5,7 @@
, autoreconfHook , autoreconfHook
, pkg-config , pkg-config
, texinfo , texinfo
, bash
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +32,11 @@ stdenv.mkDerivation rec {
}) })
]; ];
postPatch = lib.optionalString (psutils != null) '' postPatch = ''
# BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs
substituteInPlace contrib/gdiffmk/gdiffmk.sh \
--replace "@BASH_PROG@" "/bin/sh"
'' + lib.optionalString (psutils != null) ''
substituteInPlace src/preproc/html/pre-html.cpp \ substituteInPlace src/preproc/html/pre-html.cpp \
--replace "psselect" "${psutils}/bin/psselect" --replace "psselect" "${psutils}/bin/psselect"
'' + lib.optionalString (netpbm != null) '' '' + lib.optionalString (netpbm != null) ''
@ -45,7 +50,8 @@ stdenv.mkDerivation rec {
--replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage"
''; '';
buildInputs = [ ghostscript psutils netpbm perl ]; strictDeps = true;
buildInputs = [ ghostscript psutils netpbm perl bash ];
nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; nativeBuildInputs = [ autoreconfHook pkg-config texinfo ];
# Builds running without a chroot environment may detect the presence # Builds running without a chroot environment may detect the presence