diff options
| author | Lassulus <github@lassul.us> | 2022-11-23 23:48:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-23 23:48:19 +0100 |
| commit | 88238ce44abc74c45bf9c94975aad688353e1022 (patch) | |
| tree | d5b696e7823567a5fdaca3df752f3cf328f12830 /pkgs/applications/editors | |
| parent | 1e3e6bc92027a0b950ac3a322dcb48e76f78806b (diff) | |
| parent | b42d97f572ed427bb420652015378541164e18dd (diff) | |
Merge pull request #201182 from thblt/image-format-libs-for-pgtk-emacs
emacs: build pgtk variant with full image support
Diffstat (limited to 'pkgs/applications/editors')
| -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 21d286ff3a2c8..486435cc86b47 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -144,9 +144,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 @@ -178,8 +179,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" @@ -189,7 +192,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" ; |