avizo: 1.1 -> 1.2

main
Nicolas Berbiche 2 years ago
parent 80d6b6df01
commit de585f82e1
No known key found for this signature in database
GPG Key ID: FA5696EDF35DA0B6
  1. 11
      pkgs/applications/misc/avizo/default.nix
  2. 15
      pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch

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

@ -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')
Loading…
Cancel
Save