feedbackd: 0.8.1 -> 0.8.2 (#410803)

nixos/modules/programs/feedbackd.nix

@@ -17,10 +17,15 @@ in
         Your user needs to be in the `feedbackd` group to trigger effects
       '';
       package = lib.mkPackageOption pkgs "feedbackd" { };
+      theme-package = lib.mkPackageOption pkgs "feedbackd-device-themes" {
+        nullable = true;
+      };
     };
   };
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
+    environment.systemPackages = [
+      cfg.package
+    ] ++ (if cfg.theme-package != null then [ cfg.theme-package ] else [ ]);
 
     services.dbus.packages = [ cfg.package ];
     services.udev.packages = [ cfg.package ];

pkgs/by-name/fe/feedbackd-device-themes/package.nix

@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  meson,
+  ninja,
+  json-glib,
+  feedbackd,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "feedbackd-device-themes";
+  version = "0.8.3";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "agx";
+    repo = "feedbackd-device-themes";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-z+A2G1g2gNfC0cVWUO/LT3QVvXeotcBd+5UEpEtcPfY=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    json-glib # Provides json-glib-validate
+  ];
+
+  nativeCheckInputs = [
+    feedbackd # Provides fbd-theme-validate
+  ];
+
+  mesonFlags = [
+    (lib.mesonOption "validate" (if finalAttrs.doCheck then "enabled" else "disabled"))
+  ];
+
+  doCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  strictDeps = true;
+
+  meta = with lib; {
+    description = "Device specific feedback themes for Feedbackd";
+    homepage = "https://gitlab.freedesktop.org/agx/feedbackd-device-themes";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [
+      pacman99
+      Luflosi
+    ];
+    platforms = platforms.linux;
+  };
+})

pkgs/by-name/fe/feedbackd/package.nix

@@ -20,21 +20,13 @@
   dbus,
   gmobile,
   umockdev,
+  feedbackd-device-themes,
   nix-update-script,
 }:
 
-let
-  themes = fetchFromGitLab {
-    domain = "source.puri.sm";
-    owner = "Librem5";
-    repo = "feedbackd-device-themes";
-    rev = "v0.4.0";
-    hash = "sha256-kY/+DyRxKEUzq7ctl6Va14AKUCpWU7NRQhJOwhtkJp8=";
-  };
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "feedbackd";
-  version = "0.8.1";
+  version = "0.8.2";
 
   outputs = [
     "out"
@@ -43,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchFromGitLab {
-    domain = "source.puri.sm";
-    owner = "Librem5";
+    domain = "gitlab.freedesktop.org";
+    owner = "agx";
     repo = "feedbackd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-J2BNDF9TyW+srW0pGbGt4/Uw4KPVf/Ke+HJVBldmfCA=";
+    hash = "sha256-Hd+kHLr+d1+mg9BbD1pCfVZuwmf7Hk02xmDTmR3foh4=";
   };
 
   depsBuildBuild = [
@@ -93,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     mkdir -p $out/lib/udev/rules.d
     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/
   '';
 
   postFixup = ''
@@ -111,10 +102,18 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
+  strictDeps = true;
+
   meta = with lib; {
-    description = "Daemon to provide haptic (and later more) feedback on events";
-    homepage = "https://source.puri.sm/Librem5/feedbackd";
-    license = licenses.gpl3Plus;
+    description = "Theme based Haptic, Visual and Audio Feedback";
+    homepage = "https://gitlab.freedesktop.org/agx/feedbackd/";
+    license = with licenses; [
+      # feedbackd
+      gpl3Plus
+
+      # libfeedback library
+      lgpl21Plus
+    ];
     maintainers = with maintainers; [
       pacman99
       Luflosi