public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58472 from thefloweringash/emacs-x-darwin

Browse Source 
emacs: only use patchelf on linux
This commit is contained in:
Matthew Bauer 2019-03-28 17:02:21 -04:00 committed by GitHub
commit 45dbb34640
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs/default.nix
View File

@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
let libPath = lib.makeLibraryPath [ let libPath = lib.makeLibraryPath [
libXcursor libXcursor
]; ];
in lib.optionalString (withX && toolkit == "lucid") '' in lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
patchelf --set-rpath \ patchelf --set-rpath \
"$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \ "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \
"$out/bin/emacs" "$out/bin/emacs"