summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-10-21 00:20:18 +0100
committerGitHub <noreply@github.com>2018-10-21 00:20:18 +0100
commit96abc33451efed52c21ea831379728c9c3421059 (patch)
tree6478aa34a1a3c0dc09a8ae50d00d7c8faaf7ef8e /pkgs/data
parente1b72348cf249cbb341bf40938ee7aeeb6037b3a (diff)
parent526d2b28c9120f715513e8301d349ed91b699f26 (diff)
downloadnixpkgs-96abc33451efed52c21ea831379728c9c3421059.tar
nixpkgs-96abc33451efed52c21ea831379728c9c3421059.tar.gz
nixpkgs-96abc33451efed52c21ea831379728c9c3421059.tar.bz2
nixpkgs-96abc33451efed52c21ea831379728c9c3421059.tar.lz
nixpkgs-96abc33451efed52c21ea831379728c9c3421059.tar.xz
nixpkgs-96abc33451efed52c21ea831379728c9c3421059.tar.zst
nixpkgs-96abc33451efed52c21ea831379728c9c3421059.zip
Merge pull request #48761 from romildo/upd.elementary-icon-theme
elementary-icon-theme: 4.3.1 -> 5.0
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/icons/elementary-icon-theme/default.nix28
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index db4b5ea6387..75847041ce6 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl, cmake, gtk3 }:
+{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "elementary-icon-theme-${version}";
-  version = "4.3.1";
+  version = "5.0";
 
-  src = fetchurl {
-    url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
-    sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb";
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = "icons";
+    rev = version;
+    sha256 = "146s26q4bb5sag35iv42hrnbdciam2ajl7s5s5jayli5vp8bw08w";
   };
 
-  nativeBuildInputs = [ cmake gtk3 ];
+  nativeBuildInputs = [ meson ninja python3 gtk3 ];
 
-  postPatch = "cat > volumeicon/CMakeLists.txt";
-  postFixup = "gtk-update-icon-cache $out/share/icons/elementary";
+  postPatch = ''
+    chmod +x meson/symlink.py
+    patchShebangs .
+    sed -i volumeicon/meson.build -e "s,'/','$out',"
+  '';
 
+  postFixup = ''
+    gtk-update-icon-cache $out/share/icons/elementary
+  '';
 
   meta = with stdenv.lib; {
-    description = "Elementary icon theme";
-    homepage = https://launchpad.net/elementaryicons;
+    description = "Icons from the Elementary Project";
+    homepage = https://github.com/elementary/icons;
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = with maintainers; [ simonvandel ];