Merge pull request #68662 from romildo/upd.arc-theme

arc-theme: 20190330 -> 20190910
This commit is contained in:
José Romildo Malaquias 2019-09-14 08:40:54 -03:00 committed by GitHub
commit ad333743a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 15 deletions

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "arc-theme"; pname = "arc-theme";
version = "20190330"; version = "20190910";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NicoHood"; owner = "arc-design";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "16n5svgkpa8azxgyy64zwjjc04r57wfzkdq9igqvbvwkbvx8aa89"; sha256 = "161kx9ii5ij1503nvhgn3pyqfj7cj03l1di2yf8kwwfczbi4mq3j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
optipng optipng
inkscape inkscape
gtk3 gtk3
gnome3.gnome-shell
]; ];
propagatedUserEnvPkgs = [ propagatedUserEnvPkgs = [
@ -29,26 +28,23 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postPatch = ''
patchShebangs .
# TODO: remove this after update
ln -s 3.30 common/gnome-shell/3.32
'';
preBuild = '' preBuild = ''
# Shut up inkscape's warnings about creating profile directory # Shut up inkscape's warnings about creating profile directory
export HOME="$NIX_BUILD_ROOT" export HOME="$NIX_BUILD_ROOT"
''; '';
configureFlags = [ "--disable-unity" ]; configureFlags = [
"--with-gnome-shell=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}"
"--disable-unity"
];
postInstall = '' postInstall = ''
install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell";
homepage = https://github.com/NicoHood/arc-theme; homepage = https://github.com/arc-design/arc-theme;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ simonvandel romildo ]; maintainers = with maintainers; [ simonvandel romildo ];
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -966,8 +966,6 @@ in
novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; novacomd = callPackage ../development/mobile/webos/novacomd.nix { };
}; };
arc-theme = callPackage ../misc/themes/arc { };
arc-kde-theme = callPackage ../misc/themes/arc-kde { }; arc-kde-theme = callPackage ../misc/themes/arc-kde { };
adapta-gtk-theme = callPackage ../misc/themes/adapta { }; adapta-gtk-theme = callPackage ../misc/themes/adapta { };
@ -16534,6 +16532,8 @@ in
arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; arc-icon-theme = callPackage ../data/icons/arc-icon-theme { };
arc-theme = callPackage ../data/themes/arc { };
arkpandora_ttf = callPackage ../data/fonts/arkpandora { }; arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; aurulent-sans = callPackage ../data/fonts/aurulent-sans { };