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

Merge pull request #180067 from Artturin/depcmakestring

Browse Source 
stdenv: start deprecating non-list cmakeFlags
This commit is contained in:
Robert Hensing
2022-07-05 15:35:41 +02:00
committed by GitHub
parent 0083a683d7 732f1d8142
commit d2952941ba
5 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/faust/faust2.nix
+4 -3
View File
@@ -58,9 +58,10 @@ let
cd build
'';
cmakeFlags = ''
-C ../backends/all.cmake -C ../targets/all.cmake ..
'';
cmakeFlags = [
"-C../backends/all.cmake"
"-C../targets/all.cmake"
];
postInstall = ''
# syntax error when eval'd directly
pkgs/applications/office/PageEdit/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake qttranslations ];
propagatedBuildInputs = [ qtsvg qtwebengine ];
cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0";
cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];
meta = with lib; {
description = "ePub XHTML Visual Editor";
pkgs/applications/video/rtabmap/default.nix
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
];
# Disable warnings that are irrelevant to us as packagers
cmakeFlags = "-Wno-dev";
cmakeFlags = [ "-Wno-dev" ];
# We run one of the executables we build while the build is
# still running (and patchelf hasn't been invoked) which means
pkgs/development/libraries/libcef/default.nix
+1 -1
View File
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}";
cmakeFlags = [ "-DPROJECT_ARCH=${platformInfo.projectArch}" ];
makeFlags = [ "libcef_dll_wrapper" ];
dontStrip = true;
dontPatchELF = true;
pkgs/stdenv/generic/make-derivation.nix
+31 -13
View File
@@ -330,6 +330,37 @@ else let
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";
cmakeFlags =
let
explicitFlags =
if lib.isString cmakeFlags then lib.warn
"String 'cmakeFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}"
[cmakeFlags]
else if cmakeFlags == null then
lib.warn
"Null 'cmakeFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}"
[]
else
cmakeFlags;
crossFlags = [
"-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"
] ++ lib.optionals (stdenv.hostPlatform.uname.processor != null) [
"-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
] ++ lib.optionals (stdenv.hostPlatform.uname.release != null) [
"-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}"
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
"-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
] ++ lib.optionals (stdenv.buildPlatform.uname.system != null) [
"-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
] ++ lib.optionals (stdenv.buildPlatform.uname.processor != null) [
"-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
] ++ lib.optionals (stdenv.buildPlatform.uname.release != null) [
"-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"
];
in
explicitFlags ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) crossFlags;
inherit patches;
inherit doCheck doInstallCheck;
@@ -342,19 +373,6 @@ else let
outputHashAlgo = attrs.outputHashAlgo or "sha256";
outputHashMode = attrs.outputHashMode or "recursive";
} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
cmakeFlags =
(/**/ if lib.isString cmakeFlags then [cmakeFlags]
else if cmakeFlags == null then []
else cmakeFlags)
++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (
lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"]
++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}"
++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}";
mesonFlags = if mesonFlags == null then null else let
# See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamily = platform: with platform;