From b84ca8131aabdfbe7d361219fc22174119704a4d Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Sun, 10 Feb 2019 13:38:12 -0200
Subject: greybird: 3.22.9 -> 3.22.10

---
 pkgs/data/themes/greybird/default.nix | 38 ++++++++++++++++++++++++++++++++++
 pkgs/misc/themes/greybird/default.nix | 39 -----------------------------------
 pkgs/top-level/all-packages.nix       |  4 ++--
 3 files changed, 40 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/data/themes/greybird/default.nix
 delete mode 100644 pkgs/misc/themes/greybird/default.nix

diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
new file mode 100644
index 000000000000..02c8d2b64901
--- /dev/null
+++ b/pkgs/data/themes/greybird/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "greybird";
+  version = "3.22.10";
+
+  src = fetchFromGitHub {
+    owner = "shimmerproject";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1g1mnzxqwlbymq8npd2j294f8dzf9fw9nicd4pajmscg2vk71da9";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    which
+    sassc
+    glib
+    libxml2
+  ];
+
+  buildInputs = [
+    gdk_pixbuf
+    librsvg
+  ];
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Grey and blue theme from the Shimmer Project for GTK+-based environments";
+    homepage = https://github.com/shimmerproject/Greybird;
+    license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
deleted file mode 100644
index 8cc1a6415fbe..000000000000
--- a/pkgs/misc/themes/greybird/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname = "greybird";
-  version = "3.22.9";
-
-  src = fetchFromGitHub {
-    owner = "shimmerproject";
-    repo = "${pname}";
-    rev = "v${version}";
-    sha256 = "0mixs47v0jvqpmfsv0k0d0l24y4w35krah8mgnwamr0b8spmazz3";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    which
-    sassc
-    glib
-    libxml2
-  ];
-
-  buildInputs = [
-    gdk_pixbuf
-    librsvg
-  ];
-
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Grey and blue theme from the Shimmer Project for GTK+-based environments";
-    homepage = https://github.com/shimmerproject/Greybird;
-    license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b51babe1c9ca..49d6a2d48e37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15592,6 +15592,8 @@ in
 
   go-font = callPackage ../data/fonts/go-font { };
 
+  greybird = callPackage ../data/themes/greybird { };
+
   gyre-fonts = callPackage ../data/fonts/gyre {};
 
   hack-font = callPackage ../data/fonts/hack { };
@@ -22453,8 +22455,6 @@ in
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  greybird = callPackage ../misc/themes/greybird { };
-
   guetzli = callPackage ../applications/graphics/guetzli { };
 
   gummi = callPackage ../applications/misc/gummi { };
-- 
cgit 1.4.1