From f16019c58fe7948f947cdc4d73464d82fb69300d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 3 Feb 2020 16:44:25 +0100 Subject: [PATCH] opencc: fix build LD_LIBRARY_PATH isn't expanded properly in makeFlags, so move it to preBuild. Fixes: 3cd8ce3bce ("treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH") --- pkgs/tools/text/opencc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 01b16908fb7..8b6ada09ebe 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation { buildInputs = [ cmake python ]; - makeFlags = [ + preBuild = '' # let intermediate tools find intermediate library - "LD_LIBRARY_PATH=$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$(CURDIR)/src" - ]; + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/src + ''; # Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools". enableParallelBuilding = false;