From 8c3e5b0401f6ec2d8e0ea676e105d57ff44618cf Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Wed, 24 Oct 2018 11:57:47 -0300 Subject: arc-theme: 20180715 -> 20181022 --- pkgs/misc/themes/arc/default.nix | 43 ++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'pkgs/misc/themes') diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 0fc86e096f3d..ca49fb7d8a45 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3 -, gnome-themes-extra, gtk-engine-murrine, optipng, inkscape}: +{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3, gnome3 +, gtk-engine-murrine, optipng, inkscape }: let pname = "arc-theme"; @@ -7,40 +7,45 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "20180715"; + version = "20181022"; src = fetchFromGitHub { owner = "NicoHood"; repo = pname; rev = version; - sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j"; + sha256 = "08951dk1irfadwpr3p323a4fprmxg53rk2r2niwq3v62ryhi3663"; }; - preBuild = '' - # Shut up inkscape's warnings - export HOME="$NIX_BUILD_ROOT" - ''; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + sassc + optipng + inkscape + gtk3 + gnome3.gnome-shell + ]; - nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ]; - buildInputs = [ gtk3 ]; + propagatedUserEnvPkgs = [ + gnome3.gnome-themes-extra + gtk-engine-murrine + ]; - propagatedUserEnvPkgs = [ gnome-themes-extra gtk-engine-murrine ]; + enableParallelBuilding = true; postPatch = '' - find . -name render-assets.sh | - while read filename - do - substituteInPlace "$filename" \ - --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \ - --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng" - done patchShebangs . ''; + preBuild = '' + # Shut up inkscape's warnings about creating profile directory + export HOME="$NIX_BUILD_ROOT" + ''; + configureFlags = [ "--disable-unity" ]; postInstall = '' - install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md + install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { -- cgit 1.4.1