diff options
Diffstat (limited to 'nixpkgs/pkgs/games/dwarf-fortress')
| -rw-r--r-- | nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/dwarf-fortress/wrapper/dfhack.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix index 544fa26b21c..5706337dffd 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -109,7 +109,7 @@ let ''; preBuild = '' - export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/depends/protobuf''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] diff --git a/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dfhack.in index 4cf884ebed2..026b33ab87b 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -7,5 +7,5 @@ for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do done cd "$DF_DIR" -LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \ +LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@" |