git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #438 from andersk/LD_LIBRARY_PATH

Fix unsafe concatenation of $LD_LIBRARY_PATH

commit1b9b3eff3f60b3127bc9758faab7474cf515c264 authorPeter Simons <simons@cryp.to> dateMon 3 Feb 2020, 10:00 (7 years ago) parent0869c51843e591
1 file changed+1−1
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
@@ -256,7 +256,7 @@ gfPhaseOverrides = unlines
256256 , " sed -i \"s|numJobs (bf bi)++||\" ./Setup.hs"
257257 -- Parallel compilation fails. Disable it.
258258 , "'';"
259− , "preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH'';"
259+ , "preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';"
260260 -- The build step itself, after having built the library, needs to be able
261261 -- to find the library it just built in order to compile grammar files.
262262 ]