diff --git a/pkgs/development/libraries/gtk+/2.16.x.nix b/pkgs/development/libraries/gtk+/2.16.x.nix index 9abbd3aa49d..2c81ecc84e0 100644 --- a/pkgs/development/libraries/gtk+/2.16.x.nix +++ b/pkgs/development/libraries/gtk+/2.16.x.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama; - passthru = { inherit libtiff libjpeg libpng; }; - meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index e4a1f0969f9..926187f7374 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; - passthru = { inherit libtiff libjpeg libpng; }; - meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix index 1496682f5e3..710400ab094 100644 --- a/pkgs/development/libraries/wxGTK-2.6/default.nix +++ b/pkgs/development/libraries/wxGTK-2.6/default.nix @@ -2,12 +2,6 @@ , 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 { name = "wxGTK-2.6.4"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x"; }; - buildInputs = [ - pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto - ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto ]; + + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 1cfa57b24d2..0bfe4c2335c 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/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 = "wxGTK-2.8.12"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; }; - 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/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix index 433f7fe2187..0520adef4dc 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 8385a52db19..2f83d3cc03f 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"