Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions utils/Helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down