diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:10:38 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:10:38 +0200 |
commit | 4b706490da936a2d80708a090662af1523de40fa (patch) | |
tree | 718177c97875d2f81e9647ee23de04c0bb48e613 /pkgs/data/icons | |
parent | 896680cd15cb5549c1985eb96d428828f6eaf2f1 (diff) | |
parent | 3d8e43691731037672c36129cbecb2fe43ffad7e (diff) | |
download | nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.gz nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.bz2 nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.lz nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.xz nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.zst nixpkgs-4b706490da936a2d80708a090662af1523de40fa.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/data/icons')
-rw-r--r-- | pkgs/data/icons/humanity-icon-theme/default.nix | 44 | ||||
-rw-r--r-- | pkgs/data/icons/zafiro-icons/default.nix | 4 |
2 files changed, 46 insertions, 2 deletions
diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix new file mode 100644 index 00000000000..62085110f51 --- /dev/null +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "humanity-icon-theme"; + version = "0.6.15"; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}.tar.xz"; + sha256 = "19ja47468s3jfabvakq9wknyfclfr31a9vd11p3mhapfq8jv9g4x"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -a Humanity* $out/share/icons + rm $out/share/icons/*/{AUTHORS,CONTRIBUTORS,COPYING} + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Humanity icons from Ubuntu"; + homepage = "https://launchpad.net/humanity/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 9014819fba5..5bd61b0866a 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; rev = "${version}"; - sha256 = "0gy3c0jkj1icnwcs23b6km9cj9cccv8y5z1w11nfdv91cq3mdhmb"; + sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; nativeBuildInputs = [ gtk3 ]; |