diff options
| author | Jason Felice <jason.m.felice@gmail.com> | 2019-09-09 12:31:09 -0400 |
|---|---|---|
| committer | Jason Felice <jason.m.felice@gmail.com> | 2019-09-09 12:31:09 -0400 |
| commit | 51faa42af6e95d468a63c2d043055efa7678cd79 (patch) | |
| tree | deaa03989e5742ca8b4274dfb9ba711e219d307a /pkgs/tools/system | |
| parent | 83c1e8c319799c1b95b4979fcd84ebe528a9238f (diff) | |
plan9port: avoid needing to propagate "which"
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 1f5c6814e393..c62bb8eca305 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -31,10 +31,14 @@ stdenv.mkDerivation rec { #hardcoded path substituteInPlace src/cmd/acme/acme.c \ --replace /lib/font/bit $out/plan9/font + #deprecated flags find . -type f \ -exec sed -i -e 's/_SVID_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) '' #add missing ctrl+c\z\x\v keybind for non-Darwin substituteInPlace src/cmd/acme/text.c \ @@ -45,7 +49,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - which perl + perl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ xorgproto libX11 libXext libXt fontconfig freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. |