summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2016-10-14 09:27:33 -0400
committerGitHub <noreply@github.com>2016-10-14 09:27:33 -0400
commitc12b5d5e160655c6457b517c88dfeae05b2d7585 (patch)
treead8b1e699586ba5d3033d2b251ed20dddbf0761c /pkgs
parent2cfe0407b84ff378afdb6b5b9d4eba3da074254d (diff)
parent6eef45e58e05ff726ae9e916b9b1a6afe76c0b6f (diff)
downloadnixlib-c12b5d5e160655c6457b517c88dfeae05b2d7585.tar
nixlib-c12b5d5e160655c6457b517c88dfeae05b2d7585.tar.gz
nixlib-c12b5d5e160655c6457b517c88dfeae05b2d7585.tar.bz2
nixlib-c12b5d5e160655c6457b517c88dfeae05b2d7585.tar.lz
nixlib-c12b5d5e160655c6457b517c88dfeae05b2d7585.tar.xz
nixlib-c12b5d5e160655c6457b517c88dfeae05b2d7585.tar.zst
nixlib-c12b5d5e160655c6457b517c88dfeae05b2d7585.zip
Merge pull request #19542 from romildo/upd.arc-theme
arc-theme: 2016-06-06 -> 2016-10-13
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/misc/themes/arc/default.nix25
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index b7ff36c0917c..09599604a472 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  version = "2016-06-06";
-  name = "arc-gtk-theme-${version}";
+  name = "${pname}-${version}";
+  pname = "arc-theme";
+  version = "2016-10-13";
 
   src = fetchFromGitHub {
     owner = "horst3180";
-    repo = "arc-theme";
-    rev = "d24a7b5b4eb25e1a094bdf4e125332cfb8e2c8c1";
-    sha256 = "07rf21xhyz3if4n5ccmzmjf9rz9w7wkvci7ccivhh6lkillfbxgi";
+    repo = pname;
+    rev = "a9ce9d56ae61f23592fa4a8c200085dde7b43e07";
+    sha256 = "02w8nckd4q548shdgml9ndnbnq1g7nq6v8df89mx4l3lc9r6354y";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -17,13 +18,21 @@ stdenv.mkDerivation rec {
 
   preferLocalBuild = true;
 
-  configureFlags = "--with-gnome=${gnome3.version} ";
+  configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ];
+
+  postInstall = ''
+    mkdir -p $out/share/plank/themes
+    cp -r extra/*-Plank $out/share/plank/themes
+    mkdir -p $out/share/doc/$pname/Chrome
+    cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome
+    cp AUTHORS README.md $out/share/doc/$pname/
+  '';
 
   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";
+    homepage = "https://github.com/horst3180/arc-theme";
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ simonvandel romildo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9450ef9915e3..3ac147cba1b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -535,7 +535,7 @@ in
 
   androidsdk_extras = self.androidenv.androidsdk_6_0_extras;
 
-  arc-gtk-theme = callPackage ../misc/themes/arc { };
+  arc-theme = callPackage ../misc/themes/arc { };
 
   adapta-gtk-theme = callPackage ../misc/themes/adapta { };