treewide: Remove now-unneeded LD_LIBRARY_PATH in cmake derivations
Since the setting DCMAKE_SKIP_BUILD_RPATH was disabled, we can now run the checkPhase of cmake derivations without having to tweak the LD_LIBRARY_PATH anymore.
This commit is contained in:
committed by
Artturin
parent
1ca04aa9f1
commit
bcd7045998
@@ -43,14 +43,6 @@ stdenv.mkDerivation rec {
|
||||
sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h
|
||||
'';
|
||||
|
||||
# Hack to be able to run the test, broken because we use
|
||||
# CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
|
||||
preBuild = if stdenv.isDarwin then ''
|
||||
export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake python3 validatePkgConfig ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
Reference in New Issue
Block a user