From f11eff088e0780ba76697b1a30268f188441fac6 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Wed, 17 Jan 2024 09:37:04 +0100 Subject: [PATCH 1/2] wofi-emoji: 2023-06-19 -> 2023-12-22 --- pkgs/applications/misc/wofi-emoji/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index f759ee34fb0f..8d37990c4142 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -6,13 +6,13 @@ let emojiJSON = fetchurl { in stdenv.mkDerivation rec { pname = "wofi-emoji"; - version = "unstable-2023-06-19"; + version = "unstable-2023-12-22"; src = fetchFromGitHub { owner = "Zeioth"; repo = pname; - rev = "796d688b71ac9fa1e5b2c1b9a3fa11dba801b02b"; - hash = "sha256-HBsqekNuKqxaKaSeLboukLm4Lkg9JakPO7uN3Z8QBC8="; + rev = "2cc95880848134a3bbe0675bcb62a0dae1d0f572"; + hash = "sha256-t9M8z8JxuvBDzNs98L7YTNUfTK23W1DYGdHDiXNQOgk="; }; nativeBuildInputs = [ jq ]; From 527feea2a3c4f15c7a2ed8dbd1c59959d7024a2b Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Wed, 17 Jan 2024 09:37:11 +0100 Subject: [PATCH 2/2] wofi-emoji: fix paths in shell script --- pkgs/applications/misc/wofi-emoji/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index 8d37990c4142..bf58b9195658 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace build.sh \ --replace 'curl ${emojiJSON.url}' 'cat ${emojiJSON}' + substituteInPlace wofi-emoji \ + --replace 'wofi' '${wofi}/bin/wofi' \ + --replace 'wtype' '${wtype}/bin/wtype' \ + --replace 'wl-copy' '${wl-clipboard}/bin/wl-copy' ''; buildPhase = ''