From 9c86dfdd611a56757e1a74a08f98302bc60f83a1 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sat, 20 Aug 2022 21:20:08 +0100 Subject: [PATCH] godot: use wrapProgram instead of makeWrapper This solves an accidental infinite recursion in wrapper generation caused by using makeWrapper on the same input and output path --- pkgs/development/tools/godot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index dcf7a6219c44..09e30c3a9ad4 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -81,6 +81,9 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp bin/godot.* $out/bin/godot + wrapProgram "$out/bin/godot" \ + --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib + mkdir "$dev" cp -r modules/gdnative/include $dev @@ -93,9 +96,6 @@ stdenv.mkDerivation rec { cp icon.png "$out/share/icons/godot.png" substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \ --replace "Exec=godot" "Exec=$out/bin/godot" - - makeWrapper $out/bin/godot $out/bin/godot \ - --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib ''; meta = with lib; {