arc-theme: Fix build with gnome 3.24

(cherry picked from commit fefdc00)
NixOS · Sep 7, 2017 · 165fa89 · 165fa89
1 parent b50193f
commit 165fa89
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
@@ -1,15 +1,19 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }:
 
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+let
+  # treat versions newer than 3.22 as 3.22
+  gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version;
   pname = "arc-theme";
-  version = "2016-11-25";
+
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "2017-05-12";
 
   src = fetchFromGitHub {
-    owner = "horst3180";
-    repo = pname;
-    rev = "d641d3de1641a9aa0a0f6ac1bacec91d9fdd3326";
-    sha256 = "06ysd19bpqsng2bp2gqzn0wpjhldxgwvlzngrs6mkm9hr7ky5z00";
+    owner  = "horst3180";
+    repo   = pname;
+    rev    = "8290cb813f157a22e64ae58ac3dfb5983b0416e6";
+    sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
 
   preferLocalBuild = true;
 
-  configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ];
+  configureFlags = [ "--disable-unity" "--with-gnome=${gnomeVersion}" ];
 
   postInstall = ''
     mkdir -p $out/share/plank/themes
@@ -30,9 +34,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell";
-    homepage = https://github.com/horst3180/arc-theme;
-    license = licenses.gpl3;
-    platforms = platforms.unix;
+    homepage    = https://github.com/horst3180/arc-theme;
+    license     = licenses.gpl3;
     maintainers = with maintainers; [ simonvandel romildo ];
+    platforms   = platforms.unix;
   };
 }