From eab45971205cefdcc8ddd5522e0253ca403e2584 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Thu, 27 Jul 2023 20:22:42 +0200 Subject: [PATCH 1/2] iio-sensor-proxy: 3.0 -> 3.5 --- .../linux/iio-sensor-proxy/default.nix | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index d2dd6605601..d87c88f5585 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,50 +1,57 @@ -{ lib, stdenv, fetchFromGitLab, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }: +{ lib +, stdenv +, fetchFromGitLab +, cmake +, libxml2 +, meson +, ninja +, pkg-config +, libgudev +, systemd +, polkit +}: stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; - version = "3.0"; + version = "3.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "hadess"; - repo = pname; - rev = version; - sha256 = "0ngbz1vkbjci3ml6p47jh6c6caipvbkm8mxrc8ayr6vc2p9l1g49"; + owner = "hadess"; + repo = pname; + rev = version; + hash = "sha256-pFu+nJzj45s7yIKoLWLeiv2AT5vLf6JpdWWQ0JZfnvY="; }; - configurePhase = '' - runHook preConfigure - - ./autogen.sh --prefix=$out \ - --with-udevrulesdir=$out/lib/udev/rules.d \ - --with-systemdsystemunitdir=$out/lib/systemd/system - - runHook postConfigure + postPatch = '' + # upstream meson.build currently doesn't have an option to change the default polkit dir + substituteInPlace data/meson.build \ + --replace 'polkit_policy_directory' "'$out/share/polkit-1/actions'" ''; buildInputs = [ - glib - gtk3 - gtk-doc libgudev systemd + polkit ]; nativeBuildInputs = [ - autoconf - autoconf-archive - automake - gettext - intltool - libtool + meson + cmake + libxml2 + ninja pkg-config ]; + mesonFlags = [ + (lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d") + (lib.mesonOption "systemdsystemunitdir" "${placeholder "out"}/lib/systemd/system") + ]; + meta = with lib; { description = "Proxy for sending IIO sensor data to D-Bus"; homepage = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"; - license = licenses.gpl3 ; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; From 8761d9dbd5972107048dcf0bf6de32a54b872f18 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Sat, 29 Jul 2023 15:57:24 +0200 Subject: [PATCH 2/2] iio-sensor-proxy: change maintainer --- pkgs/os-specific/linux/iio-sensor-proxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index d87c88f5585..05fd82401a2 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "Proxy for sending IIO sensor data to D-Bus"; homepage = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"; license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ _999eagle ]; platforms = platforms.linux; }; }