From e1b93806ba17694f8891577b98e09eab92cd026d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Jun 2020 09:11:14 +0200 Subject: [PATCH] autogen: try fixing on darwin and cause no rebuild elsewhere. In commit 2988780 I forgot that patchelf makes no sense there. --- pkgs/development/tools/misc/autogen/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 2911855e702..3e634bedfd1 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; nativeBuildInputs = [ - which pkgconfig perl autoreconfHook/*patches applied*/ + which pkgconfig perl autoreconfHook/*patches applied*/ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done + '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # remove /build/** from RPATHs for f in "$bin"/bin/*; do local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')"