diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-20 06:22:39 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-20 06:22:39 +0000 |
| commit | 83a44e5a6505ff0ec0d9a165a97b3477c3428718 (patch) | |
| tree | f7b22d7a3d1fc7fb79c51c4ac7d2d1eca5268b29 /pkgs/development/libraries/wxGTK-2.9 | |
| parent | e803d715c2c676b5731fed34b4c6edc3a9322c9b (diff) | |
| download | nixlib-83a44e5a6505ff0ec0d9a165a97b3477c3428718.tar nixlib-83a44e5a6505ff0ec0d9a165a97b3477c3428718.tar.gz nixlib-83a44e5a6505ff0ec0d9a165a97b3477c3428718.tar.bz2 nixlib-83a44e5a6505ff0ec0d9a165a97b3477c3428718.tar.lz nixlib-83a44e5a6505ff0ec0d9a165a97b3477c3428718.tar.xz nixlib-83a44e5a6505ff0ec0d9a165a97b3477c3428718.tar.zst nixlib-83a44e5a6505ff0ec0d9a165a97b3477c3428718.zip | |
wxGTK: rely on gtk.propagatedBuildInputs
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
Diffstat (limited to 'pkgs/development/libraries/wxGTK-2.9')
| -rw-r--r-- | pkgs/development/libraries/wxGTK-2.9/2.9.0.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxGTK-2.9/default.nix | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix index 433f7fe2187d..0520adef4dcd 100644 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix +++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix @@ -2,12 +2,6 @@ , 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 { name = "wxwidgets-2.9.0"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; }; - buildInputs = [ - pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto mesa - ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index 8385a52db19a..2f83d3cc03fb 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -2,12 +2,6 @@ , 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 { name = "wxwidgets-2.9.1"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; }; - buildInputs = [ - pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto mesa - ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" |