From de585f82e1453e5bc441bf1b4d4cf4bb5492d115 Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Wed, 2 Mar 2022 16:41:08 -0500
Subject: [PATCH] avizo: 1.1 -> 1.2

---
 pkgs/applications/misc/avizo/default.nix          | 11 ++---------
 .../avizo/use-sysconfdir-instead-of-etc.patch     | 15 ---------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete 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 7325e29f682..d4808829586 100644
--- a/pkgs/applications/misc/avizo/default.nix
+++ b/pkgs/applications/misc/avizo/default.nix
@@ -7,26 +7,19 @@
 
 stdenv.mkDerivation rec {
   pname = "avizo";
-  # Note: remove the 'use-sysconfig' patch on the next update
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "misterdanb";
     repo = "avizo";
     rev = version;
-    sha256 = "sha256-0BJodJ6WaHhuSph2D1AC+DMafctgiSCyaZ8MFn89AA8=";
+    sha256 = "sha256-BRtdCOBFsKkJif/AlnF7N9ZDcmA+878M9lDQld+SAgo=";
   };
 
   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
deleted file mode 100644
index 947559760cb..00000000000
--- a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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')
-