From 684bad056950880d05e4534e683362c6a0abce55 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Sep 2019 00:58:51 +0200
Subject: [PATCH] gtk: move expressions

---
 .../01-build-Fix-path-handling-in-pkgconfig.patch             | 0
 pkgs/development/libraries/{gtk+ => gtk}/2.0-darwin-x11.patch | 0
 .../libraries/{gtk+ => gtk}/2.0-immodules.cache.patch         | 0
 pkgs/development/libraries/{gtk+ => gtk}/2.x.nix              | 0
 pkgs/development/libraries/{gtk+ => gtk}/3.0-darwin-x11.patch | 0
 .../libraries/{gtk+ => gtk}/3.0-immodules.cache.patch         | 0
 pkgs/development/libraries/{gtk+ => gtk}/3.x.nix              | 0
 .../libraries/{gtk+ => gtk}/gtk2-theme-paths.patch            | 0
 pkgs/development/libraries/{gtk+ => gtk}/gtk3-setup-hook.sh   | 0
 pkgs/development/libraries/{gtk+ => gtk}/setup-hook.sh        | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 11 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/{gtk+ => gtk}/01-build-Fix-path-handling-in-pkgconfig.patch (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/2.0-darwin-x11.patch (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/2.0-immodules.cache.patch (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/2.x.nix (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/3.0-darwin-x11.patch (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/3.0-immodules.cache.patch (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/3.x.nix (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/gtk2-theme-paths.patch (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/gtk3-setup-hook.sh (100%)
 rename pkgs/development/libraries/{gtk+ => gtk}/setup-hook.sh (100%)

diff --git a/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch
rename to pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch
diff --git a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk/2.0-darwin-x11.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
rename to pkgs/development/libraries/gtk/2.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch b/pkgs/development/libraries/gtk/2.0-immodules.cache.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/2.0-immodules.cache.patch
rename to pkgs/development/libraries/gtk/2.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/2.x.nix
rename to pkgs/development/libraries/gtk/2.x.nix
diff --git a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk/3.0-darwin-x11.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
rename to pkgs/development/libraries/gtk/3.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch b/pkgs/development/libraries/gtk/3.0-immodules.cache.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/3.0-immodules.cache.patch
rename to pkgs/development/libraries/gtk/3.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/3.x.nix
rename to pkgs/development/libraries/gtk/3.x.nix
diff --git a/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch b/pkgs/development/libraries/gtk/gtk2-theme-paths.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
rename to pkgs/development/libraries/gtk/gtk2-theme-paths.patch
diff --git a/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh b/pkgs/development/libraries/gtk/gtk3-setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/gtk+/gtk3-setup-hook.sh
rename to pkgs/development/libraries/gtk/gtk3-setup-hook.sh
diff --git a/pkgs/development/libraries/gtk+/setup-hook.sh b/pkgs/development/libraries/gtk/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/gtk+/setup-hook.sh
rename to pkgs/development/libraries/gtk/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13a1f6087be..2296119769d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11216,7 +11216,7 @@ in
 
   elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };
 
-  gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
+  gtk2 = callPackage ../development/libraries/gtk/2.x.nix {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
 
@@ -11226,7 +11226,7 @@ in
     gdktarget = "x11";
   };
 
-  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
+  gtk3 = callPackage ../development/libraries/gtk/3.x.nix {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };