From 741083e9808c9355781951f2f5b32011cd4b97b3 Mon Sep 17 00:00:00 2001 From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 7 Feb 2025 00:39:19 +0530 Subject: [PATCH] hyprpaper: fix hardcoded bash link (#379851) Closes https://github.com/NixOS/nixpkgs/issues/379770 Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/hy/hyprpaper/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index 3d04aa0caa41..e1357e1c69fc 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, cmake, cairo, + bash, expat, file, fribidi, @@ -41,6 +42,15 @@ gcc14Stdenv.mkDerivation (finalAttrs: { hash = "sha256-pmkJCzjflvsOytiu2mgn2wfSeyL6mTfoi214T4A2OZQ="; }; + prePatch = '' + substituteInPlace src/main.cpp \ + --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.rev}"' + ''; + postPatch = '' + substituteInPlace src/helpers/MiscFunctions.cpp \ + --replace-fail '/bin/bash' '${bash}/bin/bash' + ''; + nativeBuildInputs = [ cmake pkg-config @@ -50,6 +60,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + bash expat file fribidi @@ -73,11 +84,6 @@ gcc14Stdenv.mkDerivation (finalAttrs: { hyprgraphics ]; - prePatch = '' - substituteInPlace src/main.cpp \ - --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.rev}"' - ''; - meta = with lib; { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility";