diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-02-03 16:44:25 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-02-03 16:49:41 +0100 |
| commit | f16019c58fe7948f947cdc4d73464d82fb69300d (patch) | |
| tree | 15bd407d1b0d404bacc524484150f40226bef169 /pkgs/tools/text/opencc | |
| parent | 117b7677f725ec3b161a45dec0fea0654c374e62 (diff) | |
| download | nixpkgs-f16019c58fe7948f947cdc4d73464d82fb69300d.tar nixpkgs-f16019c58fe7948f947cdc4d73464d82fb69300d.tar.gz nixpkgs-f16019c58fe7948f947cdc4d73464d82fb69300d.tar.bz2 nixpkgs-f16019c58fe7948f947cdc4d73464d82fb69300d.tar.lz nixpkgs-f16019c58fe7948f947cdc4d73464d82fb69300d.tar.xz nixpkgs-f16019c58fe7948f947cdc4d73464d82fb69300d.tar.zst nixpkgs-f16019c58fe7948f947cdc4d73464d82fb69300d.zip | |
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")
Diffstat (limited to 'pkgs/tools/text/opencc')
| -rw-r--r-- | pkgs/tools/text/opencc/default.nix | 6 |
1 files 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; |