From 3cc4bfa7a372e611f46a6fe60d59bb3abcd36469 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 23 Apr 2017 15:15:46 -0500 Subject: wxwidgets: restructure into one folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s easier to manage these in one folder. Affected folders from pkgs/development/libraries/: - wxGTK-2.8 - wxGTK-2.9 - wxGTK-3.0 - wxmac These will all go into pkgs/development/libraries/wxwidgets for now. --- pkgs/development/libraries/wxGTK-2.8/default.nix | 70 ------------------------ 1 file changed, 70 deletions(-) delete mode 100644 pkgs/development/libraries/wxGTK-2.8/default.nix (limited to 'pkgs/development/libraries/wxGTK-2.8/default.nix') diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix deleted file mode 100644 index 9538f1dd1f85..000000000000 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null -, compat24 ? false, compat26 ? true, unicode ? true, -}: - -assert withMesa -> mesa_glu != null && mesa_noglu != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - version = "2.8.12.1"; - name = "wxGTK-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; - }; - - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] - ++ optional withMesa mesa_glu; - - nativeBuildInputs = [ pkgconfig ]; - - hardeningDisable = [ "format" ]; - - 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 "") - "--enable-mediactrl" - "--enable-graphics_ctx" - ] ++ optional withMesa "--with-opengl"; - - # These variables are used by configure to find some dependencies. - SEARCH_INCLUDE = - "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; - SEARCH_LIB = - "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; - - # Work around a bug in configure. - NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - "; - - postBuild = "(cd contrib/src && make)"; - - postInstall = " - (cd contrib/src && make install) - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat24 compat26 unicode; - gtk = gtk2; - }; - - enableParallelBuilding = true; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} -- cgit 1.4.1