From 6e873de5b87e33043c02c2f77291c167e09be829 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Jan 2023 16:50:38 +0800 Subject: [PATCH] monitor: 0.14.0 -> 0.15.0 https://github.com/stsdc/monitor/compare/0.14.0...0.15.0 --- pkgs/applications/system/monitor/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 84596f6d9382..db7a37e2be34 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -8,9 +8,11 @@ , pkg-config , pantheon , python3 +, curl , gettext , glib , gtk3 +, json-glib , libwnck , libgee , libgtop @@ -25,13 +27,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-dw1FR9nU8MY6LBL3sF942azeSgKmCntXCk4+nhMb4Wo="; + sha256 = "sha256-w4c9rVO54mrjUX2iRxUQ7PHqE+8D+BqBgHMK2X9nI0g="; fetchSubmodules = true; }; @@ -46,8 +48,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + curl glib gtk3 + json-glib pantheon.granite pantheon.wingpanel libgee @@ -72,6 +76,11 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py + + # Alternatively, using pkg-config here should just work. + substituteInPlace meson.build --replace \ + "meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \ + "meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')" ''; passthru = {