about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-05-13 12:13:25 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-05-13 12:13:25 +0200
commit658b7c3f2ebb7d04d950b95ce81cd5fea2a03141 (patch)
treefdcfa83f21b9c98315a3a751ef4d27772976589a /pkgs/misc
parentf14841f3ce734b27988a605fc9775a035d313d23 (diff)
parenta2981671523416ad5c9a49de8c16ac8fccb2306b (diff)
downloadnixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar
nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.gz
nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.bz2
nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.lz
nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.xz
nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.zst
nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.zip
Merge master into staging
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/themes/materia-theme/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 69a874d07c3f..4b6d364a8569 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
 
-  buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ];
+  buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
       -e "s|if .*which gnome-shell.*;|if true;|" \
       -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
     mkdir -p $out/share/themes
-    ./install.sh --dest $out/share/themes
+    # name is used internally by the package installation script
+    name= ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';