summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2020-09-06 16:15:25 +0200
committerMaciej Krüger <mkg20001@gmail.com>2020-09-08 01:05:32 +0200
commitb5839daf69e3cdff68200cf357fdcf2f74257c4e (patch)
tree15773731d6b730b960217f589a7966e203e9cea1
parentc08e45ff3b5d78b4fdf30159ac29b0ed4c2f4594 (diff)
downloadnixpkgs-b5839daf69e3cdff68200cf357fdcf2f74257c4e.tar
nixpkgs-b5839daf69e3cdff68200cf357fdcf2f74257c4e.tar.gz
nixpkgs-b5839daf69e3cdff68200cf357fdcf2f74257c4e.tar.bz2
nixpkgs-b5839daf69e3cdff68200cf357fdcf2f74257c4e.tar.lz
nixpkgs-b5839daf69e3cdff68200cf357fdcf2f74257c4e.tar.xz
nixpkgs-b5839daf69e3cdff68200cf357fdcf2f74257c4e.tar.zst
nixpkgs-b5839daf69e3cdff68200cf357fdcf2f74257c4e.zip
vanilla-dmz: 0.4.4 -> 0.4.5 (+license fix)
The package debian/copyright states Attribution-ShareAlike 3.0 Unported 
(CC BY-SA 3.0) which is cc-by-sa-30, was wrongly cc-by-nc-sa-30 which is 
unfree
-rw-r--r--pkgs/data/icons/vanilla-dmz/default.nix26
1 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
index c92a8052700..55ba320bc98 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -1,21 +1,34 @@
-{ stdenv, lib, fetchzip, xorg, hicolor-icon-theme }:
+{ stdenv
+, lib
+, fetchzip
+, xorg
+, hicolor-icon-theme
+}:
 
 stdenv.mkDerivation rec {
   pname = "vanilla-dmz";
-  version = "0.4.4";
+  version = "0.4.5";
+
   src = fetchzip {
-    url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz";
-    sha256 = "1l0c0svk7dy0d7icg7j2181wdn3fvks5gmyqnvjk749ppy5ks8mj";
+    url = "mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.xz";
+    sha256 = "14r8fri4byyzavzdifpga6118hxqjwpzd11xxj28s16zxcanq16m";
   };
-  buildInputs = [ xorg.xcursorgen ];
+
+  buildInputs = [
+    xorg.xcursorgen
+  ];
+
   propagatedBuildInputs = [
     hicolor-icon-theme
   ];
+
   dontDropIconThemeCache = true;
+
   buildPhase = ''
     cd DMZ-White/pngs; ./make.sh; cd -
     cd DMZ-Black/pngs; ./make.sh; cd -
   '';
+
   installPhase = ''
     install -d $out/share/icons/Vanilla-DMZ/cursors
     cp -a DMZ-White/xcursors/* $out/share/icons/Vanilla-DMZ/cursors
@@ -25,11 +38,12 @@ stdenv.mkDerivation rec {
     cp -a DMZ-Black/xcursors/* $out/share/icons/Vanilla-DMZ-AA/cursors
     install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme
   '';
+
   meta = with lib; {
     homepage = "http://jimmac.musichall.cz";
     description = "A style neutral scalable cursor theme";
     platforms = platforms.all;
-    license = licenses.cc-by-nc-sa-30;
+    license = licenses.cc-by-sa-30;
     maintainers = with maintainers; [ cstrahan ];
   };
 }