3
0
Fork 0
forked from mirrors/nixpkgs

cmake: don't override cmakeDir when set (#40687)

When dontUseCmakeBuildDir is true (aka the default), it overrides
cmakeDir regardless of the package configuration.

While packaging netbee, I needed to both keep dontUseCmakeBuildDir to
true (some hardcoded paths expect the build folder) and set cmakeDir
(since CMakeList.txt was in a subfolder) which proved impossible.
Here is the fix.
This commit is contained in:
Matthieu Coudron 2018-06-03 21:28:28 +09:00 committed by Orivej Desh
parent 4c797160f8
commit a6809c0dd0

View file

@ -22,7 +22,7 @@ cmakeConfigurePhase() {
if [ -z "$dontUseCmakeBuildDir" ]; then
mkdir -p build
cd build
cmakeDir=..
cmakeDir=${cmakeDir:-..}
fi
if [ -z "$dontAddPrefix" ]; then