diff options
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" |