summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/3.20/core
diff options
context:
space:
mode:
authorKirill Boltaev <aske@fmap.me>2016-09-12 00:24:51 +0300
committerKirill Boltaev <aske@fmap.me>2016-09-12 18:26:06 +0300
commitbccd75094fd5108b3d834ad3a86e056eed3b0337 (patch)
tree8954184c0376ef2f8218b7df7049edde7ef6a49b /pkgs/desktops/gnome-3/3.20/core
parent30107249b1a5681771591cd65aa4f1c98f4cb023 (diff)
downloadnixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.gz
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.bz2
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.lz
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.xz
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.zst
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.zip
treewide: explicitly specify gtk and related package versions
Diffstat (limited to 'pkgs/desktops/gnome-3/3.20/core')
-rw-r--r--pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix2
-rw-r--r--pkgs/desktops/gnome-3/3.20/core/gsound/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.20/core/mutter/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.20/core/totem/default.nix2
5 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
index e77e9e19970c..78fc82ebaed0 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
+, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
 , gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   buildInputs = with gnome3;
-    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
+    [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
index d0d7bceef61f..cf781d24b6f0 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra gdk_pixbuf librsvg
+      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg
       clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
       libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
       libical libtool nss gtk gstreamer makeWrapper gdm
diff --git a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix
index 5f255743313e..95785d9ed4d2 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }:
 
 let
   majVer = "1.0";
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
     sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
   };
 
-  buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ];
+  buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GSound;
diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
index a128990b4029..8b992d30e809 100644
--- a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
+, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
-      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
+      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
       gnome3.geocode_glib
       libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
 
diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix
index 194b4aca4383..884b328dbe71 100644
--- a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./x86.patch ];
 
-  propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject ];
+  propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
 
   configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];