diff options
author | matthewcroughan <matt@croughan.sh> | 2022-08-20 21:20:08 +0100 |
---|---|---|
committer | matthewcroughan <matt@croughan.sh> | 2022-08-20 21:20:08 +0100 |
commit | 9c86dfdd611a56757e1a74a08f98302bc60f83a1 (patch) | |
tree | 41d1bd5a76db95eb7925f69aace2c9b2407cc00c /pkgs | |
parent | 303121f35f8812983a9f72406ded883294e9948a (diff) | |
download | nixlib-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar nixlib-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.gz nixlib-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.bz2 nixlib-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.lz nixlib-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.xz nixlib-9c86dfdd611a56757e1a74a08f98302bc60f83a1.tar.zst nixlib-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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/godot/default.nix | 6 |
1 files 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; { |