From d7985d419fbbf9ffe942965359181531d2700be6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:31:52 +0000
Subject: pkgs/development/libraries/wxGTK-2.9: renamed Nix files for
 consistency

svn path=/nixpkgs/trunk/; revision=31513
---
 pkgs/development/libraries/wxGTK-2.9/2.9.1.nix   | 39 ++++++++++++++++++++++++
 pkgs/development/libraries/wxGTK-2.9/default.nix | 39 ------------------------
 pkgs/top-level/all-packages.nix                  |  4 +--
 3 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
 delete mode 100644 pkgs/development/libraries/wxGTK-2.9/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
new file mode 100644
index 00000000000..2f83d3cc03f
--- /dev/null
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, mesa, compat24 ? false, compat26 ? true, unicode ? true,
+}:
+
+stdenv.mkDerivation {
+  name = "wxwidgets-2.9.1";
+
+  src = fetchurl {
+    url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2;
+    sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
+  };
+
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+
+  buildNativeInputs = [ pkgconfig ];
+
+  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/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
deleted file mode 100644
index 2f83d3cc03f..00000000000
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, mesa, compat24 ? false, compat26 ? true, unicode ? true,
-}:
-
-stdenv.mkDerivation {
-  name = "wxwidgets-2.9.1";
-
-  src = fetchurl {
-    url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2;
-    sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
-  };
-
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
-
-  buildNativeInputs = [ pkgconfig ];
-
-  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 ed7a818aafd..9777f7cbfcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4686,11 +4686,11 @@ let
     inherit (gtkLibs) gtk;
   };
 
-  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9 {
+  wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
     inherit (gtkLibs) gtk;
   };
 
-  wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
+  wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
     inherit (gtkLibs) gtk;
   };
 
-- 
cgit 1.4.1