diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-14 09:11:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-14 09:11:14 +0200 |
| commit | e1b93806ba17694f8891577b98e09eab92cd026d (patch) | |
| tree | f2cb6c04ee0767f813c2d49d5d247d800166fc75 /pkgs | |
| parent | 0697ad33c0bb50f010d209e13baab4e86ab52763 (diff) | |
| download | nixlib-e1b93806ba17694f8891577b98e09eab92cd026d.tar nixlib-e1b93806ba17694f8891577b98e09eab92cd026d.tar.gz nixlib-e1b93806ba17694f8891577b98e09eab92cd026d.tar.bz2 nixlib-e1b93806ba17694f8891577b98e09eab92cd026d.tar.lz nixlib-e1b93806ba17694f8891577b98e09eab92cd026d.tar.xz nixlib-e1b93806ba17694f8891577b98e09eab92cd026d.tar.zst nixlib-e1b93806ba17694f8891577b98e09eab92cd026d.zip | |
autogen: try fixing on darwin
and cause no rebuild elsewhere. In commit 2988780 I forgot that patchelf makes no sense there.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/autogen/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 2911855e7023..3e634bedfd19 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')" |