From eb16ac11ce2e4408a0c805413bc7bb4afcac9203 Mon Sep 17 00:00:00 2001 From: Michael Dibbets Date: Fri, 2 Jan 2026 12:21:54 +0100 Subject: [PATCH 1/2] Added dependencies to flake.nix so just build also works on Ubuntu nix environment --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index ea6faeb..77aec1e 100644 --- a/flake.nix +++ b/flake.nix @@ -384,11 +384,17 @@ pkgs.inotify-tools pkgs.cabal-install pkgs.haskellPackages.ghc + pkgs.patchelf + pkgs.pkg-config ]; buildInputs = [ haskell-dependencies pkgs.zlib + pkgs.zlib.dev + pkgs.zstd + pkgs.xz + pkgs.bzip2 ]; LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs; From b433dd2a55b9b65550b596c00dae4384efb037d0 Mon Sep 17 00:00:00 2001 From: Michael Dibbets Date: Fri, 2 Jan 2026 12:31:10 +0100 Subject: [PATCH 2/2] Modifed helpers.sh as it couldn't find ./result/bin/patchelf; patch elf was added to the nix flake and then the global patchelf could be called that was added to the nativeBuildInputs in the flake --- utils/Helpers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/Helpers.sh b/utils/Helpers.sh index 579df70..4b7d141 100644 --- a/utils/Helpers.sh +++ b/utils/Helpers.sh @@ -16,11 +16,11 @@ updateEmail() { # wlroots in the nix store patchGodotWlroots(){ PATH_TO_SIMULA_WLROOTS="`pwd`/submodules/wlroots/build/" - OLD_RPATH="`./result/bin/patchelf --print-rpath submodules/godot/bin/godot.x11.tools.64`" + OLD_RPATH="`patchelf --print-rpath submodules/godot/bin/godot.x11.tools.64`" if [[ $OLD_RPATH != $PATH_TO_SIMULA_WLROOTS* ]]; then # Check if the current RPATH contains our local simula wlroots build. If not, patchelf it to add it echo "Patching godot.x11.tools to point to local wlroots lib" echo "Changing path to: $PATH_TO_SIMULA_WLROOTS:$OLD_RPATH" - ./result/bin/patchelf --set-rpath "$PATH_TO_SIMULA_WLROOTS:$OLD_RPATH" submodules/godot/bin/godot.x11.tools.64 + patchelf --set-rpath "$PATH_TO_SIMULA_WLROOTS:$OLD_RPATH" submodules/godot/bin/godot.x11.tools.64 else echo "Not patching godot.x11.tools, already patched." fi