nix: wrap hyprland-share-picker with hyprland in PATH

flake.nix

@@ -26,12 +26,15 @@
       (builtins.substring 4 2 longDate)
       (builtins.substring 6 2 longDate)
     ]);
-  in {
-    overlays.default = _: prev: {
-      xdg-desktop-portal-hyprland = prev.callPackage ./nix/default.nix {
     version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+  in {
+    overlays.default = _: prev: rec {
+      xdg-desktop-portal-hyprland = prev.callPackage ./nix/default.nix {
         inherit (inputs) hyprland-protocols;
+        inherit hyprland-share-picker version;
       };
+
+      hyprland-share-picker = prev.libsForQt5.callPackage ./nix/hyprland-share-picker.nix {inherit version;};
     };
 
     packages = genSystems (system:

nix/default.nix

@@ -8,6 +8,7 @@
   pkg-config,
   wayland-protocols,
   wayland-scanner,
+  hyprland-share-picker,
   hyprland-protocols,
   inih,
   libdrm,
@@ -17,9 +18,7 @@
   wayland,
   libsForQt5,
   version ? "git",
-}: let
+}:
-  hyprland-share-picker = libsForQt5.callPackage ./hyprland-share-picker.nix {inherit version;};
-in
 stdenv.mkDerivation {
   pname = "xdg-desktop-portal-hyprland";
   inherit version;
@@ -32,7 +31,8 @@ in
   buildInputs = [inih libdrm mesa pipewire systemd wayland wayland-protocols];
 
   preConfigure = ''
-      rmdir protocols/hyprland-protocols
+    # for some reason rmdir doesn't work in a dirty tree
+    rmdir protocols/hyprland-protocols || true
 
     ln -s ${hyprland-protocols.outPath}/ protocols/hyprland-protocols
   '';

nix/hyprland-share-picker.nix

@@ -5,6 +5,7 @@
   qtbase,
   makeShellWrapper,
   wrapQtAppsHook,
+  hyprland,
   slurp,
   version ? "git",
   ...
@@ -22,6 +23,6 @@ stdenv.mkDerivation {
   postInstall = ''
     wrapProgramShell $out/bin/hyprland-share-picker \
       "''${qtWrapperArgs[@]}" \
-      --prefix PATH ":" ${lib.makeBinPath [slurp]}
+      --prefix PATH ":" ${lib.makeBinPath [slurp hyprland]}
   '';
 }