diff options
| author | Josef Kemetmüller <josef.kemetmueller@gmail.com> | 2021-08-20 17:29:48 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-07-04 03:49:01 +0300 |
| commit | bcd70459981a6411418c2d8b0c13039270bdbf30 (patch) | |
| tree | ac80298e67dbf1006df93d99eaa5925efc53c4dc /pkgs/development/libraries/jsoncpp | |
| parent | 1ca04aa9f1bec24bd4e01bac7932bbdb91737abb (diff) | |
| download | nixpkgs-bcd70459981a6411418c2d8b0c13039270bdbf30.tar nixpkgs-bcd70459981a6411418c2d8b0c13039270bdbf30.tar.gz nixpkgs-bcd70459981a6411418c2d8b0c13039270bdbf30.tar.bz2 nixpkgs-bcd70459981a6411418c2d8b0c13039270bdbf30.tar.lz nixpkgs-bcd70459981a6411418c2d8b0c13039270bdbf30.tar.xz nixpkgs-bcd70459981a6411418c2d8b0c13039270bdbf30.tar.zst nixpkgs-bcd70459981a6411418c2d8b0c13039270bdbf30.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/jsoncpp')
| -rw-r--r-- | pkgs/development/libraries/jsoncpp/default.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 77d49c70003..d9cf9a6c434 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -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 = [ |