From 67741a72494bd76fba27ec8ed9b6e1c28d98af47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 May 2021 17:16:33 +0200 Subject: [PATCH] feedbackd: unstable-2021-01-25 -> 0.0.0+git20210426 Align version scheme with upstream and other distros. Also split outputs and build man pages as well as documentation. --- pkgs/applications/misc/feedbackd/default.nix | 40 ++++++++++++++------ 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 1cf2fee3710..4cdf3399135 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -1,46 +1,65 @@ { lib , stdenv , fetchFromGitLab +, docbook-xsl-nons +, gobject-introspection +, gtk-doc +, libxslt , meson , ninja , pkg-config +, vala , wrapGAppsHook , glib , gsound -, libgudev , json-glib -, vala -, gobject-introspection +, libgudev +, dbus }: stdenv.mkDerivation rec { - pname = "feedbackd-unstable"; - version = "2021-01-25"; + pname = "feedbackd"; + # Not an actual upstream project release, + # only a Debian package release that is tagged in the upstream repo + version = "0.0.0+git20210426"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; - rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}"; - sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v"; + rev = "v${version}"; + sha256 = "12kdchv11c5ynpv6fbagcx755x5p2kd7acpwjxi9khwdwjsqxlmn"; }; nativeBuildInputs = [ + docbook-xsl-nons + gobject-introspection + gtk-doc + libxslt meson ninja pkg-config - wrapGAppsHook vala - gobject-introspection + wrapGAppsHook ]; buildInputs = [ glib gsound - libgudev json-glib + libgudev ]; + mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ]; + + checkInputs = [ + dbus + ]; + + doCheck = true; + postInstall = '' mkdir -p $out/lib/udev/rules.d sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules @@ -54,4 +73,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } -