From a06d5deedc1b5c71d6bc1c63ab6a6e7c1df343c0 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 22 Mar 2022 06:27:45 +0100 Subject: [PATCH] arc-theme: 20211018 -> 20220223 --- pkgs/data/themes/arc/default.nix | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index ea18da119c7e..11e76c202764 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -3,36 +3,33 @@ , sassc , meson , ninja -, pkg-config -, gtk3 , glib , gnome , gtk-engine-murrine -, optipng , inkscape , cinnamon +, makeFontsConf +, python3 }: stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20211018"; + version = "20220223"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1rrxm5b7l8kq1h0lm08ck54xljzm8w573mxx904n3rhdg3ri9d63"; + sha256 = "sha256-qsZdXDNxT1/gIlkUsC1cfVrULApC+dHreBXXjVTJQiA="; }; nativeBuildInputs = [ meson ninja - pkg-config sassc - optipng inkscape - gtk3 glib # for glib-compile-resources + python3 ]; propagatedUserEnvPkgs = [ @@ -40,17 +37,23 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - preBuild = '' - # Shut up inkscape's warnings about creating profile directory - export HOME="$NIX_BUILD_ROOT" + postPatch = '' + patchShebangs meson/install-file.py ''; + preBuild = '' + # Shut up inkscape's warnings about creating profile directory + export HOME="$TMPDIR" + ''; + + # Fontconfig error: Cannot load default config file: No such file: (null) + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + mesonFlags = [ - "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" - "-Dvariants=light,darker,dark,lighter" + # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" + # "-Dvariants=light,darker,dark,lighter" "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" "-Dgnome_shell_version=${gnome.gnome-shell.version}" - "-Dgtk3_version=${gtk3.version}" # You will need to patch gdm to make use of this. "-Dgnome_shell_gresource=true" ];