From 51faa42af6e95d468a63c2d043055efa7678cd79 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Mon, 9 Sep 2019 12:31:09 -0400 Subject: [PATCH] plan9port: avoid needing to propagate "which" --- pkgs/tools/system/plan9port/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 1f5c6814e39..c62bb8eca30 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.