diff options
| author | Volth <volth@webmaster.ms> | 2017-05-26 13:43:25 +0000 |
|---|---|---|
| committer | Volth <volth@webmaster.ms> | 2017-05-26 13:43:25 +0000 |
| commit | b7ccf27229d9479e5cea2f2d2c2b06477d9e3049 (patch) | |
| tree | 692f21c6fd2adc50e6a08c41c01749b3280342d0 /pkgs/applications/editors/emacs | |
| parent | 690a83091bd0e10ce7c70b081c861a6ff2a6d532 (diff) | |
| download | nixlib-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar nixlib-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.gz nixlib-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.bz2 nixlib-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.lz nixlib-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.xz nixlib-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.zst nixlib-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.zip | |
rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 216c04afd726..c51227bbc6f7 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -5,7 +5,7 @@ , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null -, withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -16,7 +16,7 @@ assert withGTK2 -> withX || stdenv.isDarwin; assert withGTK3 -> withX || stdenv.isDarwin; assert withGTK2 -> !withGTK3 && gtk2 != null; assert withGTK3 -> !withGTK2 && gtk3 != null; -assert withXwidgets -> withGTK3 && webkitgtk24x != null; +assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; let toolkit = @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x glib_networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; |