From 1c7b2186e23d06e277d1e9adb9557dd4dfa11b4a Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Sun, 9 Jan 2022 21:24:05 -0500
Subject: [PATCH] avizo: unstable-2021-07-21 -> 1.1

Includes a temporary `meson.build` patch that will need to be
removed on the next update.
---
 pkgs/applications/misc/avizo/default.nix          | 15 +++++++++++----
 .../avizo/use-sysconfdir-instead-of-etc.patch     | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch

diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix
index 407dd7040637..7325e29f682b 100644
--- a/pkgs/applications/misc/avizo/default.nix
+++ b/pkgs/applications/misc/avizo/default.nix
@@ -5,21 +5,28 @@
 , gobject-introspection, gdk-pixbuf, wrapGAppsHook
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "avizo";
-  version = "unstable-2021-07-21";
+  # Note: remove the 'use-sysconfig' patch on the next update
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "misterdanb";
     repo = "avizo";
-    rev = "7b3874e5ee25c80800b3c61c8ea30612aaa6e8d1";
-    sha256 = "sha256-ixAdiAH22Nh19uK5GoAXtAZJeAfCGSWTcGbrvCczWYc=";
+    rev = version;
+    sha256 = "sha256-0BJodJ6WaHhuSph2D1AC+DMafctgiSCyaZ8MFn89AA8=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ];
 
   buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ];
 
+  patches = [
+    # Remove on next update
+    # See https://github.com/misterdanb/avizo/pull/30
+    ./use-sysconfdir-instead-of-etc.patch
+  ];
+
   postInstall = ''
     substituteInPlace "$out"/bin/volumectl \
       --replace 'avizo-client' "$out/bin/avizo-client"
diff --git a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch b/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch
new file mode 100644
index 000000000000..947559760cbc
--- /dev/null
+++ b/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 1c789be..cd4b07a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -12,7 +12,9 @@ app_resources_service = gnome.compile_resources(
+   source_dir : '.',
+   c_name : 'avizo_resources')
+ 
+-install_data('config.ini', install_dir: '/etc/xdg/avizo')
++sysconfdir = get_option('sysconfdir')
++
++install_data('config.ini', install_dir: join_paths(sysconfdir, 'xdg/avizo'))
+ install_data('volumectl', install_dir: 'bin')
+ install_data('lightctl', install_dir: 'bin')
+