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

treewide: fix *Flags

Browse Source
This commit is contained in:
Robin Gloster
2019-12-30 04:50:37 +01:00
committed by Jan Tojnar
parent 20b02b80aa
commit ac8eaa8507
26 changed files with 107 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gdcm/default.nix
+5 -5
View File
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
cd ../build
'';
cmakeFlags = ''
-DGDCM_BUILD_APPLICATIONS=ON
-DGDCM_BUILD_SHARED_LIBS=ON
-DGDCM_USE_VTK=ON
'';
cmakeFlags = [
"-DGDCM_BUILD_APPLICATIONS=ON"
"-DGDCM_BUILD_SHARED_LIBS=ON"
"-DGDCM_USE_VTK=ON"
];
enableParallelBuilding = true;
buildInputs = [ cmake vtk ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ];
pkgs/development/libraries/libnabo/default.nix
+3 -3
View File
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = "
-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
";
cmakeFlags = [
"-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3"
];
doCheck = true;
checkTarget = "test";
pkgs/development/libraries/libpointmatcher/default.nix
+3 -3
View File
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = "
-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
";
cmakeFlags = [
"-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3"
];
doCheck = true;
checkPhase = ''
pkgs/development/libraries/libtcod/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
echo 'INSTALL(DIRECTORY include DESTINATION .)' >> CMakeLists.txt
'';
cmakeFlags="-DLIBTCOD_SAMPLES=OFF";
cmakeFlags = [ "-DLIBTCOD_SAMPLES=OFF" ];
buildInputs = [ cmake SDL libGLU libGL upx zlib ];
pkgs/development/libraries/tbb/default.nix
+2 -4
View File
@@ -11,10 +11,8 @@ with stdenv.lib; stdenv.mkDerivation rec {
sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj";
};
makeFlags = concatStringsSep " " (
optional (compiler != null) "compiler=${compiler}" ++
optional (stdver != null) "stdver=${stdver}"
);
makeFlags = optional (compiler != null) "compiler=${compiler}"
++ optional (stdver != null) "stdver=${stdver}";
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;