From 26e82e684c7d6c450dd29916d842ef5bd0112969 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 28 Mar 2019 15:58:45 +0900 Subject: [PATCH] emacs: only use patchelf on linux This prevents building Emacs with X on Darwin. Broken by 5af6e9f75e89dab40b2ac9cb9b0fe92cc66f1311 (#54916) --- pkgs/applications/editors/emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2f7a4233656..12d4c24ea4b 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"