public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-02-05 10:28:52 +01:00
parent 080f1e7f5c 2b3d2dbaf9
commit 76a439239e
156 changed files with 1607 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/opencc/default.nix
+3 -3
View File
@@ -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;