feedbackd: 0.2.0 -> 0.4.1

pkgs/applications/misc/feedbackd/default.nix

@@ -17,6 +17,8 @@
 , json-glib
 , libgudev
 , dbus
+, gmobile
+, umockdev
 }:
 
 let
@@ -28,9 +30,9 @@ let
     sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80=";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "feedbackd";
-  version = "0.2.0";
+  version = "0.4.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -38,9 +40,8 @@ stdenv.mkDerivation rec {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "feedbackd";
-    rev = "v${version}";
-    hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s=";
-    fetchSubmodules = true;
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ta14DYqkid8Cp8fx9ZMGOOJroCBszN9/VrTN6mrpTZg=";
   };
 
   depsBuildBuild = [
@@ -66,22 +67,26 @@ stdenv.mkDerivation rec {
     gsound
     json-glib
     libgudev
+    gmobile
   ];
 
   mesonFlags = [
     "-Dgtk_doc=true"
     "-Dman=true"
+    # Make compiling work when doCheck = false
+    "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
   ];
 
   nativeCheckInputs = [
     dbus
+    umockdev
   ];
 
   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
+    sed "s|/usr/libexec/|$out/libexec/|" < $src/data/90-feedbackd.rules > $out/lib/udev/rules.d/90-feedbackd.rules
     cp ${themes}/data/* $out/share/feedbackd/themes/
   '';
 
@@ -103,4 +108,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ pacman99 ];
     platforms = platforms.linux;
   };
-}
+})