From d0bacdf9b42e750769f80b637f58a32f643f16eb Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Wed, 2 May 2018 21:06:55 +0200 Subject: Fix oomox-gtk-theme derivation after update …I am not clear what happened here. --- home.nix | 3 ++- pkgs/oomox-gtk-theme.nix | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/home.nix b/home.nix index bd6e68a..843a93d 100644 --- a/home.nix +++ b/home.nix @@ -31,9 +31,10 @@ gitg ]; - # required to enable auto-mounting in pcmanfm sessionVariables = { + # required to enable auto-mounting in pcmanfm GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + # use GTK theme in libreoffice SAL_USE_VCLPLUGIN = "gtk"; }; diff --git a/pkgs/oomox-gtk-theme.nix b/pkgs/oomox-gtk-theme.nix index aa393a9..6e217dd 100644 --- a/pkgs/oomox-gtk-theme.nix +++ b/pkgs/oomox-gtk-theme.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { repo = "oomox-gtk-theme"; owner = "themix-project"; rev = "aa9081b2899d7e8ba8ae47543173d2d9f0f13921"; - sha256 = "1q4nksnkhdpfpgcbfqbmnkjrmwxa6zv3wy43zlas2agssjkcm4x9"; + sha256 = "1yxhd6d61npx43qwa6gyvrwmivv42k3d6qn54q276aihwxlbgj4r"; }; nativeBuildInputs = with pkgs; [ librsvg glib libxml2 gdk_pixbuf bc pkgs-unstable.sass pkgs-unstable.sassc ]; @@ -42,12 +42,15 @@ stdenv.mkDerivation rec { patchShebangs . ''; - installPhase = '' - cd oomox-gtk-theme-* + buildPhase = '' HOME="$out/share/themes/oomox" ./change_color.sh --make-opts all --target-dir "$out/share/themes" --output oomox <(echo -e "${config}") ''; + installPhase = '' + cd oomox-gtk-theme-* + ''; + meta = { description = "oomox-gtk-theme is a customizable fork of numix-gtk-theme."; homepage = https://github.com/themix-project/oomox-gtk-theme; -- cgit v1.2.3