From b39f1cc3a1c9dbe262f5eb20b7b0da4a0167dbfb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 5 Aug 2022 20:02:03 +0000
Subject: [PATCH] =?UTF-8?q?gnome.adwaita-icon-theme:=2042.0=20=E2=86=92=20?=
 =?UTF-8?q?43.beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/42.0...43.beta

- Includes reduce-build-parallelism.patch.

Also:

- Format the expression.
- Remove icon-naming-utils dependency, unused since 2.34: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/52330b92bb069c073e4f31577499745480ee973f
- Remove icon-naming-utils dependency, unused since 2.34: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/f7701a76ce7cdd57c49ed52594cd75ebed882660
- Remove useless postInstall.
- Add meta.license.

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
---
 .../gnome/core/adwaita-icon-theme/default.nix | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
index 5e36cd109e43..fed3adfc90e6 100644
--- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
@@ -1,35 +1,42 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, intltool, gnome
-, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, autoreconfHook
+, gnome
+, gtk3
+, gdk-pixbuf
+, librsvg
+, hicolor-icon-theme
+}:
 
 stdenv.mkDerivation rec {
   pname = "adwaita-icon-theme";
-  version = "42.0";
+  version = "43.beta";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA=";
+    sha256 = "Ky3t0XQHefoG1ysA0QcbidFyundiqKF1YxUtHf1JXZY=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "reduce-build-parallelism.patch";
-      url = "https://gitlab.gnome.org/vcunat/adwaita-icon-theme/-/commit/27edeca7927eb2247d7385fccb3f0fd7787471e6.patch";
-      sha256 = "vDWuvz5yRhtn9obTtHRp6J7gJpXDZz1cajyquPGw53I=";
-    })
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+    gtk3
   ];
 
-  # For convenience, we can specify adwaita-icon-theme only in packages
-  propagatedBuildInputs = [ hicolor-icon-theme ];
+  buildInputs = [
+    gdk-pixbuf
+    librsvg
+  ];
 
-  buildInputs = [ gdk-pixbuf librsvg ];
-
-  nativeBuildInputs = [ pkg-config autoreconfHook intltool iconnamingutils gtk3 ];
+  propagatedBuildInputs = [
+    # For convenience, we can specify adwaita-icon-theme only in packages
+    hicolor-icon-theme
+  ];
 
   dontDropIconThemeCache = true;
 
-  # remove a tree of dirs with no files within
-  postInstall = '' rm -rf "$out/locale" '';
-
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "adwaita-icon-theme";
@@ -40,5 +47,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     platforms = with platforms; linux ++ darwin;
     maintainers = teams.gnome.members;
+    license = licenses.cc-by-sa-30;
   };
 }