diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2019-03-28 15:58:45 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2019-03-28 16:03:46 +0900 |
| commit | 26e82e684c7d6c450dd29916d842ef5bd0112969 (patch) | |
| tree | a2f601a8ce40b8dbc8842a00dae903120ed290b8 /pkgs/applications/editors/emacs | |
| parent | b16b1b377bec7d4cb7430953a14b649e5b96813f (diff) | |
| download | nixlib-26e82e684c7d6c450dd29916d842ef5bd0112969.tar nixlib-26e82e684c7d6c450dd29916d842ef5bd0112969.tar.gz nixlib-26e82e684c7d6c450dd29916d842ef5bd0112969.tar.bz2 nixlib-26e82e684c7d6c450dd29916d842ef5bd0112969.tar.lz nixlib-26e82e684c7d6c450dd29916d842ef5bd0112969.tar.xz nixlib-26e82e684c7d6c450dd29916d842ef5bd0112969.tar.zst nixlib-26e82e684c7d6c450dd29916d842ef5bd0112969.zip | |
emacs: only use patchelf on linux
This prevents building Emacs with X on Darwin. Broken by 5af6e9f75e89dab40b2ac9cb9b0fe92cc66f1311 (#54916)
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2f7a4233656c..12d4c24ea4bd 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { let libPath = lib.makeLibraryPath [ libXcursor ]; - in lib.optionalString (withX && toolkit == "lucid") '' + in lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' patchelf --set-rpath \ "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \ "$out/bin/emacs" |