summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-06 19:01:56 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-06 19:01:56 +0000
commit206d17c17fd98264e419da0ef819be4efbbdf0b2 (patch)
treee5678f178dbfd645e23abbcc3d80589b8a2b94a5
parentd7049d1c0839908b75f0ffe888788420914678fe (diff)
downloadnixpkgs-206d17c17fd98264e419da0ef819be4efbbdf0b2.tar
nixpkgs-206d17c17fd98264e419da0ef819be4efbbdf0b2.tar.gz
nixpkgs-206d17c17fd98264e419da0ef819be4efbbdf0b2.tar.bz2
nixpkgs-206d17c17fd98264e419da0ef819be4efbbdf0b2.tar.lz
nixpkgs-206d17c17fd98264e419da0ef819be4efbbdf0b2.tar.xz
nixpkgs-206d17c17fd98264e419da0ef819be4efbbdf0b2.tar.zst
nixpkgs-206d17c17fd98264e419da0ef819be4efbbdf0b2.zip
Remove wxGTK-2.6
svn path=/nixpkgs/trunk/; revision=31369
-rw-r--r--pkgs/development/libraries/wxGTK-2.6/default.nix44
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 0 insertions, 48 deletions
diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix
deleted file mode 100644
index 710400ab094..00000000000
--- a/pkgs/development/libraries/wxGTK-2.6/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, compat22 ? false, compat24 ? true, unicode ? true
-}:
-
-stdenv.mkDerivation {
-  name = "wxGTK-2.6.4";
-
-  src = fetchurl {
-    url = mirror://sourceforge/wxwindows/wxGTK-2.6.4.tar.gz;
-    sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x";
-  };
-
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto ];
-
-  buildNativeInputs = [ pkgconfig ];
-
-  configureFlags = [
-    "--enable-gtk2"
-    (if compat22 then "--enable-compat22" else "--disable-compat22")
-    (if compat24 then "--enable-compat24" else "--disable-compat24")
-    "--disable-precomp-headers"
-    (if unicode then "--enable-unicode" else "")
-  ];
-
-  # This variable is used by configure to find some dependencies.
-  SEARCH_INCLUDE =
-    "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include";
-
-  # Work around a bug in configure.
-  NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";
-
-  preConfigure = "
-    substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
-    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 gtk compat22 compat24 unicode;};
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01a00b7d04d..8b870911461 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4691,10 +4691,6 @@ let
 
   wxGTK = wxGTK28;
 
-  wxGTK26 = callPackage ../development/libraries/wxGTK-2.6 {
-    inherit (gtkLibs216) gtk;
-  };
-
   wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
     inherit (gtkLibs) gtk;
   };