diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 2db15bec9319..7dfade94684e 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -1,5 +1,5 @@ { - gtk3, + gtk4, gdk-pixbuf, librsvg, webp-pixbuf-loader, @@ -8,11 +8,10 @@ glib, shared-mime-info, gsettings-desktop-schemas, - wrapGAppsHook3, - gtk-layer-shell, + wrapGAppsHook4, + gtk4-layer-shell, adwaita-icon-theme, libxkbcommon, - libdbusmenu-gtk3, openssl, pkg-config, hicolor-icon-theme, @@ -26,6 +25,7 @@ libevdev, features ? [ ], systemd, + dbus, }: let @@ -33,22 +33,22 @@ let in rustPlatform.buildRustPackage rec { pname = "ironbar"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "ironbar"; rev = "v${version}"; - hash = "sha256-aph9onWsaEYJqz1bcBNijEexnH0MPLtoblpU9KSbksA="; + hash = "sha256-vhkNdvzY9xd8qmKgKtpVRTdvmS1QxnGKDFCpttqX1GE="; }; - cargoHash = "sha256-puBoRdCd1A8FmEu5PmczgYAdPdTA8FA1CWsh7qWjHzQ="; + cargoHash = "sha256-ptzq0407IaNrXXiksQKXDUbs2wPTz4GHtnCG49EbOcY="; buildInputs = [ - gtk3 + gtk4 gdk-pixbuf glib - gtk-layer-shell + gtk4-layer-shell glib-networking shared-mime-info adwaita-icon-theme @@ -56,11 +56,11 @@ rustPlatform.buildRustPackage rec { gsettings-desktop-schemas libxkbcommon systemd + dbus ] ++ lib.optionals (hasFeature "http") [ openssl ] ++ lib.optionals (hasFeature "volume") [ libpulseaudio ] ++ lib.optionals (hasFeature "cairo") [ luajit ] - ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ] ++ lib.optionals (hasFeature "keyboard") [ libinput libevdev @@ -68,10 +68,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook3 + wrapGAppsHook4 gobject-introspection ]; - propagatedBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ gtk4 ]; runtimeDeps = [ luajitPackages.lgi ]; @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" # gtk-launch - --suffix PATH : "${lib.makeBinPath [ gtk3 ]}" + --suffix PATH : "${lib.makeBinPath [ gtk4 ]}" '' + lib.optionalString (hasFeature "cairo") '' --prefix LUA_PATH : "./?.lua;${luajitPackages.lgi}/share/lua/5.1/?.lua;${luajitPackages.lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua"