From bcd70459981a6411418c2d8b0c13039270bdbf30 Mon Sep 17 00:00:00 2001
From: Josef Kemetmüller <josef.kemetmueller@gmail.com>
Date: Fri, 20 Aug 2021 17:29:48 +0200
Subject: 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.
---
 pkgs/development/libraries/jsoncpp/default.nix | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'pkgs/development/libraries/jsoncpp')

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 = [
-- 
cgit 1.4.1