cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

godot: use wrapProgram instead of makeWrapper

Browse source 
This solves an accidental infinite recursion in wrapper generation caused by using makeWrapper on the same input and output path
This commit is contained in:
matthewcroughan 2022-08-20 21:20:08 +01:00
parent 303121f35f
commit 9c86dfdd61
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/godot/default.nix
View file

@ -81,6 +81,9 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin" mkdir -p "$out/bin"
cp bin/godot.* $out/bin/godot cp bin/godot.* $out/bin/godot
wrapProgram "$out/bin/godot" \
--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
mkdir "$dev" mkdir "$dev"
cp -r modules/gdnative/include $dev cp -r modules/gdnative/include $dev
@ -93,9 +96,6 @@ stdenv.mkDerivation rec {
cp icon.png "$out/share/icons/godot.png" cp icon.png "$out/share/icons/godot.png"
substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \ substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot" --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; { meta = with lib; {