From cb8fcfa3e65b169cd94709fff54dd4ea55d24db7 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 3 Sep 2020 11:25:38 +0200 Subject: [PATCH 1/2] highlight: fix cross-platform build --- pkgs/tools/text/highlight/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index f44ddc9d0e91..4dafc7688883 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -20,7 +20,10 @@ let buildInputs = [ getopt lua boost ]; - prePatch = lib.optionalString stdenv.cc.isClang '' + prePatch = '' + substituteInPlace src/makefile \ + --replace "shell pkg-config" "shell $PKG_CONFIG" + '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/makefile \ --replace 'CXX=g++' 'CXX=clang++' ''; From f33e326e4029d2455d1a2a040d6e04696b0b0ff1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 16 Oct 2021 23:31:23 +0300 Subject: [PATCH 2/2] highlight: make manpage compression reproducible --- pkgs/tools/text/highlight/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 4dafc7688883..82d5eab5086f 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -23,6 +23,8 @@ let prePatch = '' substituteInPlace src/makefile \ --replace "shell pkg-config" "shell $PKG_CONFIG" + substituteInPlace makefile \ + --replace 'gzip' 'gzip -n' '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/makefile \ --replace 'CXX=g++' 'CXX=clang++'