2 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 96c43af84854..7fe968a582ba 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, autoreconfHook, sass, inkscape, glib, which, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.21.2";
+  version = "3.21.3.68";
 
   meta = with stdenv.lib; {
     description = "An adaptive GTK+ theme based on Material Design";
     homepage = "https://github.com/tista500/Adapta";
-    license = licenses.gpl2;
+    license = with licenses; [ gpl2 cc-by-sa-30 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.SShrike ];
   };
@@ -15,13 +15,15 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tista500";
     repo = "Adapta";
-    rev = "c48da995abc46087c22b05d2cdb0975d10774641";
-    sha256 = "17w9nsrwqwgafswyvhc5h8ld2ggi96ix5fjv6yf1hfz3l1ln9qg7";
+    rev = version;
+    sha256 = "0wwsmsyxfdgsc7fj1kn4r9zsgs09prizwkjljmirwrfdm6j3387p";
   };
 
   preferLocalBuild = true;
   buildInputs = [ gtk-engine-murrine ];
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook sass inkscape glib.dev which ];
+
+  postPatch = "patchShebangs .";
 
   configureFlags = "--enable-chrome --disable-unity";
 }
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 2104f6da876b..0b907f747a88 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -1,25 +1,20 @@
-{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "Blackbird";
-  version = "2016-04-10";
+  version = "2016-07-04";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = "${pname}";
     owner = "shimmerproject";
-    rev = "e9f780993c957e3349f97b0e2e6fabdc36ccefb0";
-    sha256 = "00fdd63lnb2gmsn6cbdkanvh3rvz48jg08gmzg372byhj70m63hi";
+    rev = "ab4a30ee5110c59241b739e7c54956c3244e5b2a";
+    sha256 = "1qy32n21bqq3zwn9di01fbiqv67cqr9n7jmbpcmn9v8yb5p572w3";
   };
 
-  buildInputs = [ gtk-engine-murrine ];
-  
-  dontBuild = true;
+  nativeBuildInputs = [ autoreconfHook ];
 
-  installPhase = ''
-    mkdir -p $out/share/themes/${pname}
-    cp -a * $out/share/themes/${pname}/
-  '';
+  buildInputs = [ gtk-engine-murrine ];
 
   meta = {
     description = "Dark Desktop Suite for Gtk, Xfce and Metacity";