Get rid of most references to gtkLibs

svn path=/nixpkgs/trunk/; revision=33088
This commit is contained in:
Yury G. Kudryashov
2012-03-14 21:57:32 +00:00
parent fd1867ec92
commit 68fe867e19
20 changed files with 52 additions and 57 deletions

View File

@@ -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

View File

@@ -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 =
''

View File

@@ -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 ];