MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

plan9port: avoid needing to propagate "which"

Browse source
This commit is contained in:
Jason Felice 2019-09-09 12:31:09 -04:00
parent 83c1e8c319
commit 51faa42af6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/system/plan9port/default.nix
View file

@ -31,10 +31,14 @@ stdenv.mkDerivation rec {
#hardcoded path #hardcoded path
substituteInPlace src/cmd/acme/acme.c \ substituteInPlace src/cmd/acme/acme.c \
--replace /lib/font/bit $out/plan9/font --replace /lib/font/bit $out/plan9/font
#deprecated flags #deprecated flags
find . -type f \ find . -type f \
-exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \ -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \
-exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \; -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \;
substituteInPlace bin/9c \
--replace 'which uniq' '${which}/bin/which uniq'
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
#add missing ctrl+c\z\x\v keybind for non-Darwin #add missing ctrl+c\z\x\v keybind for non-Darwin
substituteInPlace src/cmd/acme/text.c \ substituteInPlace src/cmd/acme/text.c \
@ -45,7 +49,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
which perl perl
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
xorgproto libX11 libXext libXt fontconfig xorgproto libX11 libXext libXt fontconfig
freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.