diff options
| author | adisbladis <adisbladis@gmail.com> | 2022-08-22 21:55:31 +0800 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2022-08-23 14:27:12 +0800 |
| commit | 73c90badf31492c8cf67745d46de277321b4712a (patch) | |
| tree | c3d1f49c63b4389fdc7e776b26dbcb600846b8ff /pkgs/applications/editors/emacs | |
| parent | 15fe59e33aed0ae1d1c29d55ca3c43da31064d40 (diff) | |
| download | nixlib-73c90badf31492c8cf67745d46de277321b4712a.tar nixlib-73c90badf31492c8cf67745d46de277321b4712a.tar.gz nixlib-73c90badf31492c8cf67745d46de277321b4712a.tar.bz2 nixlib-73c90badf31492c8cf67745d46de277321b4712a.tar.lz nixlib-73c90badf31492c8cf67745d46de277321b4712a.tar.xz nixlib-73c90badf31492c8cf67745d46de277321b4712a.tar.zst nixlib-73c90badf31492c8cf67745d46de277321b4712a.zip | |
emacs: Simplify patchelf invocation when building with lucid
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 1f49c3c23af0..9c1696e59da0 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -204,15 +204,10 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; - postFixup = lib.concatStringsSep "\n" [ - - (lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' - patchelf --set-rpath \ - "$(patchelf --print-rpath "$out/bin/emacs"):${lib.makeLibraryPath [ libXcursor ]}" \ - "$out/bin/emacs" + postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' + patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" - '') - ]; + ''; passthru = { inherit nativeComp; |