summary refs log tree commit diff
diff options
context:
space:
mode:
authormatthewcroughan <matt@croughan.sh>2022-08-20 21:20:08 +0100
committermatthewcroughan <matt@croughan.sh>2022-08-20 21:20:08 +0100
commit9c86dfdd611a56757e1a74a08f98302bc60f83a1 (patch)
tree41d1bd5a76db95eb7925f69aace2c9b2407cc00c
parent303121f35f8812983a9f72406ded883294e9948a (diff)
downloadnixpkgs-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar
nixpkgs-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.gz
nixpkgs-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.bz2
nixpkgs-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.lz
nixpkgs-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.xz
nixpkgs-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.zst
nixpkgs-9c86dfdd611a56757e1a74a08f98302bc60f83a1.zip
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
-rw-r--r--pkgs/development/tools/godot/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index dcf7a6219c4..09e30c3a9ad 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; {