diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 21:57:32 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 21:57:32 +0000 |
| commit | 68fe867e195626ede48975ea6d65a239392b4ca2 (patch) | |
| tree | 41b401afa6bca8fb76816fd9d8f856cb3a19a0b5 /pkgs/misc | |
| parent | fd1867ec922cfa228cb73494c3a39e7031da01d8 (diff) | |
Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/gens-gs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/emulators/mess/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index a6f457b52109..217468c5bd2a 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkLibs, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtkLibs.gtk SDL nasm zlib libpng mesa ]; + buildInputs = [ pkgconfig gtk SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 150042ad7963..990f1e7106e1 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtkLibs, gnome, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtkLibs.gtk gnome.GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk GConf mesa expat zlib ]; installPhase = '' diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index c6aa7baea2fe..9910768b5470 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - cmake, dbus_glib, glib, gtk, gtkLibs, pkgconfig, xorg }: + cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "66d571f08ec999f56de412f42a0395c9dc60b73adaaece96c6da6e98353fe379"; }; - buildInputs = [ cmake dbus_glib glib gtk gtkLibs.gdk_pixbuf + buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.pixman ]; |