diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-16 18:33:30 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-03-25 15:01:24 +0100 |
commit | fbaee683875b06bc0bbc75ade62cb0b6481d1a67 (patch) | |
tree | d3e4d4e6808a4e41abb99f4aca90586573d2e866 /pkgs/desktops/gnome/core/baobab | |
parent | 0e1489ae3b0970022369fbe4e2f690cb31f7f279 (diff) |
baobab: 41.0 → 42.beta
https://gitlab.gnome.org/GNOME/baobab/-/compare/41.0...42.beta
Diffstat (limited to 'pkgs/desktops/gnome/core/baobab')
-rw-r--r-- | pkgs/desktops/gnome/core/baobab/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 40ea18b1af1e4..188b83e59125d 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -8,22 +8,22 @@ , ninja , pkg-config , python3 -, gtk3 -, libhandy +, gtk4 +, libadwaita , glib , libxml2 -, wrapGAppsHook +, wrapGAppsHook4 , itstool , gnome }: stdenv.mkDerivation rec { pname = "baobab"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU="; + sha256 = "iVtRFak12WbKJo7yrLwYd9jfZFZ9uNAlTC4qerRnGCY="; }; nativeBuildInputs = [ @@ -37,21 +37,27 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook - # Prevents “error: Package `libhandy-1' not found in specified Vala API + wrapGAppsHook4 + # Prevents “error: Package `libadwaita-1' not found in specified Vala API # directories or GObject-Introspection GIR directories” with strictDeps, # even though it should only be a runtime dependency. - libhandy + libadwaita ]; buildInputs = [ - gtk3 - libhandy + gtk4 + libadwaita glib ]; doCheck = true; + postPatch = '' + # https://gitlab.gnome.org/GNOME/baobab/-/merge_requests/40 + substituteInPlace build-aux/post-install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; |