diff options
| author | Thibault Polge <thibault@thb.lt> | 2022-11-14 12:17:07 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-23 00:31:04 +0000 |
| commit | 76f3f035643ce30e4fcc99bc604464e3902fc299 (patch) | |
| tree | 4c64f42fb6fad499bc279a09dcb7912aa9870580 | |
| parent | Merge pull request #207332 from NixOS/backport-207177-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-201182-to-release-22.11.tar.gz | |
emacs: build pgtk variant with full image supportorigin/backport-201182-to-release-22.11
Emacs built with pgtk ("pure gtk") isn't X, so `withX` isn't true.
This commit extends the test conditions for format libraries inclusion
to withX || withPgtk, so Pgtk Emacs gets image format support
libraries as well.
Co-authored-by: Atemu <atemu.main@gmail.com>
(cherry picked from commit b42d97f572ed427bb420652015378541164e18dd)
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 26980483f37d..3e195fdec6a9 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -143,9 +143,10 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation ++ lib.optionals stdenv.isLinux [ dbus libselinux alsa-lib acl gpm ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft - gconf cairo ] - ++ lib.optionals (withX || withNS) [ librsvg ] + [ xlibsWrapper libXaw Xaw3d gconf cairo ] + ++ lib.optionals (withX || withPgtk) + [ libXpm libpng libjpeg giflib libtiff ] + ++ lib.optionals (withX || withNS || withPgtk ) [ librsvg ] ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 @@ -177,8 +178,10 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation then [ "--disable-ns-self-contained" ] else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ] - else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ]) + else if withPgtk + then [ "--with-pgtk" ] + else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ]) ++ lib.optionals withMacport [ "--with-mac" "--enable-mac-app=$$out/Applications" @@ -188,7 +191,6 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-native-compilation" ++ lib.optional withImageMagick "--with-imagemagick" - ++ lib.optional withPgtk "--with-pgtk" ++ lib.optional withXinput2 "--with-xinput2" ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars" ; |