Skip to content

Commit

Permalink
autogen: try fixing on darwin
Browse files Browse the repository at this point in the history
and cause no rebuild elsewhere.
In commit 2988780 I forgot that patchelf makes no sense there.
  • Loading branch information
vcunat committed Jun 14, 2020
1 parent 0697ad3 commit e1b9380
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkgs/development/tools/misc/autogen/default.nix
Expand Up @@ -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
Expand Down Expand Up @@ -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')"
Expand Down

0 comments on commit e1b9380

Please sign in to comment.