Merge pull request #19541 from romildo/upd.themes

vertex-theme: 20160329 -> 20161009

pkgs/misc/themes/vertex/default.nix

@@ -1,33 +1,38 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "theme-vertex-${version}";
-  version = "20160329";
+  name = "${pname}-${version}";
+  pname = "vertex-theme";
+  version = "20161009";
 
   src = fetchFromGitHub {
     owner = "horst3180";
-    repo = "Vertex-theme";
-    rev = version;
-    sha256 = "1zafnbxn9hgi4lmi254iw9jyhifcqijxa7cymwjpyy0jfa6sm1qj";
+    repo = pname;
+    rev = "c861918a7fccf6d0768d45d790a19a13bb23485e";
+    sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33";
   };
 
-  buildInputs = [ autoreconfHook gtk3 pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  configureFlags = "--disable-unity";
+  buildInputs = [ gtk-engine-murrine ];
+
+  configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ];
 
   postInstall = ''
-    mkdir -p $out/share/doc/theme-vertex
-    cp AUTHORS COPYING README.md $out/share/doc/theme-vertex/
+    mkdir -p $out/share/plank/themes
+    cp -r extra/*-Plank $out/share/plank/themes
 
-    mkdir -p $out/share/doc/theme-vertex/extra
-    cp -r extra/{Chrome,Firefox} $out/share/doc/theme-vertex/extra
+    mkdir -p $out/share/doc/$pname/Chrome
+    cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome
+    cp -r extra/Firefox $out/share/doc/$pname
+    cp AUTHORS README.md $out/share/doc/$pname/
   '';
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
     license = licenses.gpl3;
-    maintainers = [ maintainers.rycee ];
     platforms = platforms.unix;
+    maintainers = with maintainers; [ rycee romildo ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -16179,7 +16179,7 @@ in
     in
       recurseIntoAttrs (lib.makeScope qt5.newScope merged);
 
-  theme-vertex = callPackage ../misc/themes/vertex { };
+  vertex-theme = callPackage ../misc/themes/vertex { };
 
   xfce = xfce4-12;
   xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });