From 2abdb71b9969eec4101f3eeded08ccf673805380 Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Sun, 26 Feb 2023 12:45:35 +0200 Subject: [PATCH] confy: 0.6.5 -> 0.7.0 --- pkgs/applications/misc/confy/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index 99dc80e986af..ed4994517bf5 100644 --- a/pkgs/applications/misc/confy/default.nix +++ b/pkgs/applications/misc/confy/default.nix @@ -1,11 +1,11 @@ -{ appstream-glib +{ blueprint-compiler , desktop-file-utils , fetchurl , gobject-introspection -, gtk3 +, gtk4 , lib +, libadwaita , libnotify -, libhandy , meson , ninja , pkg-config @@ -16,14 +16,15 @@ stdenv.mkDerivation rec { pname = "confy"; - version = "0.6.5"; + version = "0.7.0"; src = fetchurl { url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz"; - sha256 = "sha256-zfuwOZBSGQzJUc36M6C5wSHarLbPFqayQVFo+WbVo7k="; + hash = "sha256-qOU/rPj7ZhwWafQ3Vx7K41fdAyxz6jMhFUqU3mH5CHo="; }; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils meson ninja @@ -33,8 +34,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 - libhandy + gobject-introspection + gtk4 + libadwaita libnotify (python3.withPackages (ps: with ps; [ icalendar @@ -43,8 +45,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Remove executable bits so that meson runs the script with our Python interpreter - chmod -x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py ''; meta = with lib; {