From 3cc4bfa7a372e611f46a6fe60d59bb3abcd36469 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Apr 2017 15:15:46 -0500
Subject: [PATCH] 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.
---
 .../libraries/{wxGTK-2.8 => wxwidgets/2.8}/default.nix    | 0
 .../libraries/{wxGTK-2.9 => wxwidgets/2.9}/default.nix    | 0
 .../libraries/{wxGTK-3.0 => wxwidgets/3.0}/default.nix    | 0
 .../{wxmac/default.nix => wxwidgets/3.0/mac.nix}          | 0
 pkgs/top-level/all-packages.nix                           | 8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/{wxGTK-2.8 => wxwidgets/2.8}/default.nix (100%)
 rename pkgs/development/libraries/{wxGTK-2.9 => wxwidgets/2.9}/default.nix (100%)
 rename pkgs/development/libraries/{wxGTK-3.0 => wxwidgets/3.0}/default.nix (100%)
 rename pkgs/development/libraries/{wxmac/default.nix => wxwidgets/3.0/mac.nix} (100%)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
similarity index 100%
rename from pkgs/development/libraries/wxGTK-2.8/default.nix
rename to pkgs/development/libraries/wxwidgets/2.8/default.nix
diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
similarity index 100%
rename from pkgs/development/libraries/wxGTK-2.9/default.nix
rename to pkgs/development/libraries/wxwidgets/2.9/default.nix
diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
similarity index 100%
rename from pkgs/development/libraries/wxGTK-3.0/default.nix
rename to pkgs/development/libraries/wxwidgets/3.0/default.nix
diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
similarity index 100%
rename from pkgs/development/libraries/wxmac/default.nix
rename to pkgs/development/libraries/wxwidgets/3.0/mac.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fcb95c3e8d..2899a2b33d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10191,26 +10191,26 @@ with pkgs;
 
   wxGTK = wxGTK28;
 
-  wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
+  wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
     inherit (gnome2) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
+  wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9/default.nix {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
+  wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0/default.nix {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxmac = callPackage ../development/libraries/wxmac {
+  wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
     inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
     inherit (darwin.stubs) setfile rez derez;
   };