public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxGTK: rely on gtk.propagatedBuildInputs

Browse Source 
gtkLibs224.gtk actually propagates libpng etc. through gdk_pixbuf,
so using gtk.libpng etc. makes no sense.

Remove unused 'inherit lib*;' in gtk.

svn path=/nixpkgs/trunk/; revision=29383
This commit is contained in:
Yury G. Kudryashov 2011-09-20 06:22:39 +00:00
parent e803d715c2
commit 83a44e5a65
6 changed files with 12 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gtk+/2.16.x.nix
View File

@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr
] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama; ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama;
passthru = { inherit libtiff libjpeg libpng; };
meta = { meta = {
description = "A multi-platform toolkit for creating graphical user interfaces"; description = "A multi-platform toolkit for creating graphical user interfaces";

2
pkgs/development/libraries/gtk+/2.24.x.nix
View File

@ -37,8 +37,6 @@ stdenv.mkDerivation rec {
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";
passthru = { inherit libtiff libjpeg libpng; };
meta = { meta = {
description = "A multi-platform toolkit for creating graphical user interfaces"; description = "A multi-platform toolkit for creating graphical user interfaces";

13
pkgs/development/libraries/wxGTK-2.6/default.nix
View File

@ -2,12 +2,6 @@
, compat22 ? false, compat24 ? true, unicode ? true , compat22 ? false, compat24 ? true, unicode ? true
}: }:
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wxGTK-2.6.4"; name = "wxGTK-2.6.4";
@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x"; sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x";
}; };
buildInputs = [ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto ];
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama libSM libXxf86vm xf86vidmodeproto buildNativeInputs = [ pkgconfig ];
];
configureFlags = [ configureFlags = [
"--enable-gtk2" "--enable-gtk2"

13
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@ -2,12 +2,6 @@
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , mesa, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wxGTK-2.8.12"; name = "wxGTK-2.8.12";
@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
}; };
buildInputs = [ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama libSM libXxf86vm xf86vidmodeproto mesa buildNativeInputs = [ pkgconfig ];
];
configureFlags = [ configureFlags = [
"--enable-gtk2" "--enable-gtk2"

13
pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
View File

@ -2,12 +2,6 @@
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , mesa, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wxwidgets-2.9.0"; name = "wxwidgets-2.9.0";
@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
}; };
buildInputs = [ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama libSM libXxf86vm xf86vidmodeproto mesa buildNativeInputs = [ pkgconfig ];
];
configureFlags = [ configureFlags = [
"--enable-gtk2" "--enable-gtk2"

13
pkgs/development/libraries/wxGTK-2.9/default.nix
View File

@ -2,12 +2,6 @@
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , mesa, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wxwidgets-2.9.1"; name = "wxwidgets-2.9.1";
@ -16,10 +10,9 @@ stdenv.mkDerivation {
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
}; };
buildInputs = [ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama libSM libXxf86vm xf86vidmodeproto mesa buildNativeInputs = [ pkgconfig ];
];
configureFlags = [ configureFlags = [
"--enable-gtk2" "--enable-gtk2"