diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-09-13 20:42:55 +0300 |
|---|---|---|
| committer | Kirill Boltaev <aske@fmap.me> | 2016-09-13 21:09:24 +0300 |
| commit | 0f37287df5c4ba0343c292ddfe827224efa87daf (patch) | |
| tree | ce3a7a0659c5c478cb75c96c93051b83532a8d9b /pkgs/desktops | |
| parent | 4b55b0358ad7c636b581bb8b665540f013ef68af (diff) | |
| download | nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.gz nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.bz2 nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.lz nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.xz nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.zst nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.zip | |
treewide: explicitly specify gtk version
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/GConf/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index b848296d5f0f..d1f748c993d8 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk ? null, withGtk ? false }: +, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: -assert withGtk -> (gtk != null); +assert withGtk -> (gtk2 != null); stdenv.mkDerivation { name = "gconf-2.32.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit - ++ stdenv.lib.optional withGtk gtk; + ++ stdenv.lib.optional withGtk gtk2; propagatedBuildInputs = [ glib ]; |