diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-09-03 00:41:06 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-03 00:41:06 -0300 |
| commit | 104d14b3c1b9a9b20d2c864028b742889753b247 (patch) | |
| tree | 852e483a59c1e7e03b0b7dbe3bfa047c85a483da /pkgs/applications/editors/emacs | |
| parent | 86e303475ea7687abf706bdb9382056211176551 (diff) | |
| parent | ca25a9c7b2025deafaab976912117e1ca31fc061 (diff) | |
| download | nixlib-104d14b3c1b9a9b20d2c864028b742889753b247.tar nixlib-104d14b3c1b9a9b20d2c864028b742889753b247.tar.gz nixlib-104d14b3c1b9a9b20d2c864028b742889753b247.tar.bz2 nixlib-104d14b3c1b9a9b20d2c864028b742889753b247.tar.lz nixlib-104d14b3c1b9a9b20d2c864028b742889753b247.tar.xz nixlib-104d14b3c1b9a9b20d2c864028b742889753b247.tar.zst nixlib-104d14b3c1b9a9b20d2c864028b742889753b247.zip | |
Merge pull request #187968 from adisbladis/emacs-xinput2-29
emacs: Enable xinput2 on version 29 and newer
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 4243ad47a243..d580c9cd3bbe 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -30,7 +30,7 @@ , withAthena ? false , withToolkitScrollBars ? true , withPgtk ? false -, withXinput2 ? false +, withXinput2 ? withX && lib.versionAtLeast version "29" , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) , toolkit ? ( if withGTK2 then "gtk2" @@ -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; |