From 074fd2032c1a49a5ede6b49cacf49a5ff9c9c763 Mon Sep 17 00:00:00 2001 From: Eric Wardner Date: Fri, 13 Sep 2024 17:12:29 -0400 Subject: [PATCH] cypress: use lowercase executable --- pkgs/development/web/cypress/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 7ab1cfa4d6b4..eebb68cc3fbe 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -4,6 +4,7 @@ , gtk2 , gtk3 , lib +, makeShellWrapper , mesa , nss , stdenv @@ -39,7 +40,7 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 unzip ]; + nativeBuildInputs = [ autoPatchelfHook (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) unzip makeShellWrapper]; buildInputs = with xorg; [ libXScrnSaver @@ -67,11 +68,16 @@ in stdenv.mkDerivation rec { printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json # Cypress now looks for binary_state.json in bin echo '{"verified": true}' > $out/binary_state.json - ln -s $out/opt/cypress/Cypress $out/bin/Cypress - + ln -s $out/opt/cypress/Cypress $out/bin/cypress runHook postInstall ''; + postFixup = '' + # exit with 1 after 25.05 + makeWrapper $out/opt/cypress/Cypress $out/bin/Cypress \ + --run 'echo "Warning: Use the lowercase cypress executable instead of the capitalized one."' + ''; + passthru = { updateScript = ./update.sh;