diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index b9c0d0d4436..d9846415484 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,43 +1,53 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3 +, gnome-themes-standard, gtk-engine-murrine, optipng, inkscape}: let - # treat versions newer than 3.22 as 3.22 - gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version; pname = "arc-theme"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2017-05-12"; + version = "20180715"; src = fetchFromGitHub { - owner = "horst3180"; + owner = "NicoHood"; repo = pname; - rev = "8290cb813f157a22e64ae58ac3dfb5983b0416e6"; - sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf"; + rev = version; + sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gnome3.gtk ]; + preBuild = '' + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ]; + buildInputs = [ gtk3 ]; - preferLocalBuild = true; + propagatedUserEnvPkgs = [ gnome-themes-standard gtk-engine-murrine ]; - configureFlags = [ "--disable-unity" "--with-gnome=${gnomeVersion}" ]; + 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 . + ''; + + configureFlags = [ "--disable-unity" ]; postInstall = '' - mkdir -p $out/share/plank/themes - cp -r extra/*-Plank $out/share/plank/themes - install -Dm644 -t $out/share/doc/${pname}/Chrome extra/Chrome/*.crx install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; - homepage = https://github.com/horst3180/arc-theme; + homepage = https://github.com/NicoHood/arc-theme; license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }