From 0b176e1bd02fe8ca96631904d8265ed45b17d3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 23 Mar 2011 22:05:14 +0000 Subject: [PATCH] Adding a first attempt of expression for wxwidgets 2.9. It looks like building and installing. Part of the expression I copied from wxGTK 2.8, and some parts of it may be irrelevant or wrong. svn path=/nixpkgs/trunk/; revision=26484 --- .../libraries/wxGTK-2.9/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/wxGTK-2.9/default.nix diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix new file mode 100644 index 000000000000..8385a52db19a --- /dev/null +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +, 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"; + + src = fetchurl { + url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2; + sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; + }; + + buildInputs = [ + pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib + libXinerama libSM libXxf86vm xf86vidmodeproto mesa + ]; + + configureFlags = [ + "--enable-gtk2" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + "--disable-precomp-headers" + (if unicode then "--enable-unicode" else "") + "--with-opengl" + ]; + + SEARCH_LIB = "${mesa}/lib"; + + preConfigure = " + substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace /usr /no-such-path + "; + + postInstall = " + (cd $out/include && ln -s wx-*/* .) + "; + + passthru = {inherit gtk compat24 compat26 unicode;}; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff51f02b6238..f9a788511715 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4180,6 +4180,10 @@ let inherit (gtkLibs) gtk; }; + wxGTK29 = callPackage ../development/libraries/wxGTK-2.9 { + inherit (gtkLibs) gtk; + }; + wtk = callPackage ../development/libraries/wtk { }; x264 = callPackage ../development/libraries/x264 { };