Merge master into staging-next

2019-10-08 11:56:52 +02:00
parent 0913e30c85 60b2fe660e
commit a0c34f54cc
366 changed files with 7208 additions and 3820 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "numix-icon-theme";
-  version = "18.07.17";
+  version = "19.09.20";

  src = fetchFromGitHub {
    owner = "numixproject";
    repo = pname;
    rev = version;
-    sha256 = "0clh55kmhc52d33dfm2c6h3lg6ddfh8a088ir9lv1camn9kj55bd";
+    sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w";
  };

  nativeBuildInputs = [ gtk3 ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/share/icons
-    mv Numix{,-Light} $out/share/icons
+    cp -a Numix{,-Light} $out/share/icons/
  '';

  postFixup = ''