From af840a9e0947a79a37a95a9f62062653721e43fa Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 5 Dec 2022 03:01:31 +0200 Subject: [PATCH] nix: fix picker not found --- nix/default.nix | 6 +----- nix/hyprland-share-picker.nix | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 6854515..27634b0 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -8,13 +8,11 @@ pkg-config, wayland-protocols, wayland-scanner, - grim, hyprland-protocols, inih, libdrm, mesa, pipewire, - slurp, systemd, wayland, libsForQt5, @@ -44,9 +42,7 @@ in ]; postInstall = '' - ln -s ${hyprland-share-picker.outPath}/bin $out/ - - wrapProgram $out/libexec/xdg-desktop-portal-hyprland --prefix PATH ":" ${lib.makeBinPath [grim slurp]} + wrapProgram $out/libexec/xdg-desktop-portal-hyprland --prefix PATH ":" ${lib.makeBinPath [hyprland-share-picker]} ''; meta = with lib; { diff --git a/nix/hyprland-share-picker.nix b/nix/hyprland-share-picker.nix index c1da63f..b143461 100644 --- a/nix/hyprland-share-picker.nix +++ b/nix/hyprland-share-picker.nix @@ -5,7 +5,6 @@ qtbase, makeShellWrapper, wrapQtAppsHook, - grim, slurp, version ? "git", ... @@ -23,6 +22,6 @@ stdenv.mkDerivation { postInstall = '' wrapProgramShell $out/bin/hyprland-share-picker \ "''${qtWrapperArgs[@]}" \ - --prefix PATH ":" ${lib.makeBinPath [grim slurp]} + --prefix PATH ":" ${lib.makeBinPath [slurp]} ''; }