From 70ef1faa253d635b0d492406363ceb7f472041e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 12 May 2018 18:20:38 -0300 Subject: [PATCH] materia-theme: unset $name in install script - install.sh uses a global environment variable called $name, if defined, to name the theme. This is an issue because nix sets this variable to the package name. - Replace gnome-themes-standard to gnome-themes-extra. --- pkgs/misc/themes/materia-theme/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index 69a874d07c3..4b6d364a856 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 '';