From bf4805d52375fe4f87f0e792d56cd3e4a86d0b84 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 22 Sep 2022 01:23:25 +0200 Subject: [PATCH] =?UTF-8?q?eiciel:=200.9.13.1=20=E2=86=92=200.10.0-rc2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/rofirrim/eiciel/releases/tag/0.10.0-rc1 https://github.com/rofirrim/eiciel/releases/tag/0.10.0-rc2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/tools/filesystems/eiciel/default.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index 1e676dea77c7..bfec1dcf0993 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -3,16 +3,19 @@ , stdenv , acl , gnome -, gtkmm3 +, glibmm_2_68 +, gtkmm4 , meson , ninja , pkg-config -, wrapGAppsHook +, itstool +, wrapGAppsHook4 +, gtk4 }: stdenv.mkDerivation rec { pname = "eiciel"; - version = "0.9.13.1"; + version = "0.10.0-rc2"; outputs = [ "out" "nautilusExtension" ]; @@ -20,30 +23,32 @@ stdenv.mkDerivation rec { owner = "rofirrim"; repo = "eiciel"; rev = version; - sha256 = "0rhhw0h1hyg5kvxhjxkdz03vylgax6912mg8j4lvcz6wlsa4wkvj"; + sha256 = "+MXoT6J4tKuFaSvUTcM15cKWLUnS0kYgBfqH+5lz6KY="; }; nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook + itstool + wrapGAppsHook4 + gtk4 ]; buildInputs = [ acl - gtkmm3 + glibmm_2_68 + gtkmm4 gnome.nautilus ]; mesonFlags = [ - "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" + "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-4" ]; postPatch = '' + # https://github.com/rofirrim/eiciel/pull/9 substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')" - chmod +x img/install_icons.sh - patchShebangs img/install_icons.sh ''; meta = with lib; {