git.iko.soy/typeable/nixpkgs
on master help sign in
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")

commitf16019c58fe7948f947cdc4d73464d82fb69300d authorBjørn Forsman <bjorn.forsman@gmail.com> dateMon 3 Feb 2020, 16:44 (7 years ago) parent117b767
1 file changed+3−3
pkgs/tools/text/opencc/default.nix+3−3
pkgs/tools/text/opencc/default.nix+3−3
@@ -9,10 +9,10 @@ stdenv.mkDerivation {
99
1010 buildInputs = [ cmake python ];
1111
12− makeFlags = [
12+ preBuild = ''
1313 # let intermediate tools find intermediate library
14− "LD_LIBRARY_PATH=$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$(CURDIR)/src"
15− ];
14+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/src
15+ '';
1616
1717 # 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".
1818 enableParallelBuilding = false;