From c05bd204f34daebb42647aa3b769d467d93aa304 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 7 Mar 2025 09:57:29 -0400 Subject: [PATCH] opengamepadui: use godot 4.3 explicitly --- pkgs/by-name/op/opengamepadui/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 4ad2f25edb78..ca22d434ae0a 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -5,8 +5,7 @@ dbus, fetchFromGitHub, gamescope, - godot_4, - godot_4-export-templates, + godot_4_3, hwdata, lib, libGL, @@ -46,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook cargo - godot_4 - godot_4-export-templates + godot_4_3 + godot_4_3.export-templates-bin pkg-config rustPlatform.cargoSetupHook ]; @@ -76,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: { env = let - versionAndRelease = lib.splitString "-" godot_4.version; + versionAndRelease = lib.splitString "-" godot_4_3.version; in { - GODOT = lib.getExe godot_4; + GODOT = lib.getExe godot_4_3; GODOT_VERSION = lib.elemAt versionAndRelease 0; GODOT_RELEASE = lib.elemAt versionAndRelease 1; - EXPORT_TEMPLATE = "${godot_4-export-templates}"; + EXPORT_TEMPLATE = "${godot_4_3.export-templates-bin}"; BUILD_TYPE = "${finalAttrs.buildType}"; }; @@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { # Godot looks for export templates in HOME export HOME=$(mktemp -d) mkdir -p $HOME/.local/share/godot/export_templates - ln -s "${godot_4-export-templates}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE" + ln -s "${godot_4_3.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE" ''; postInstall = ''