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; 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