Unverified Commit b42d97f5 authored by Thibault Polge's avatar Thibault Polge
Browse files

emacs: build pgtk variant with full image support 



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: default avatarAtemu <atemu.main@gmail.com>
parent 36b65b32

pkgs/applications/editors/emacs/generic.nix

+8 −6
Original line number Diff line number Diff line
@@ -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,6 +179,8 @@ 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 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 [
@@ -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"

  ;