Merge pull request #154227 from berbiche/avizo-1.1

avizo: unstable-2021-07-21 -> 1.1
This commit is contained in:
Bobby Rong 2022-01-13 15:15:45 +08:00 committed by GitHub
commit c3eb3abbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions

View File

@ -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"

View File

@ -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')