diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-03-13 22:06:17 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-03-18 01:32:42 +0300 |
| commit | a8785daf0ea794f1791c598c6cac9db3858b45bb (patch) | |
| tree | 5b01e6da2eb7189acdca02acb21e12fd452b3ee6 | |
| parent | 6cc1200bd586dc8eeb930bbc3a25299ea27e5409 (diff) | |
| download | nixlib-a8785daf0ea794f1791c598c6cac9db3858b45bb.tar nixlib-a8785daf0ea794f1791c598c6cac9db3858b45bb.tar.gz nixlib-a8785daf0ea794f1791c598c6cac9db3858b45bb.tar.bz2 nixlib-a8785daf0ea794f1791c598c6cac9db3858b45bb.tar.lz nixlib-a8785daf0ea794f1791c598c6cac9db3858b45bb.tar.xz nixlib-a8785daf0ea794f1791c598c6cac9db3858b45bb.tar.zst nixlib-a8785daf0ea794f1791c598c6cac9db3858b45bb.zip | |
emacs: fix runtime GTK3 dependencies
Fixes #23845.
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index fbf8895f971f..79c75e768205 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,7 +4,7 @@ , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null +, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null @@ -57,7 +57,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals srcRepo [ autoconf automake texinfo ]; + ++ lib.optionals srcRepo [ autoconf automake texinfo ] + ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] @@ -66,9 +67,9 @@ stdenv.mkDerivation rec { [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optional (withX && withGTK3) gtk3 + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals withXwidgets [ webkitgtk24x wrapGAppsHook glib_networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x glib_networking ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; |