mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 18:33:00 +00:00
treewide: convert string cmakeFlags to list of strings
This commit is contained in:
parent
3173c3b6b6
commit
732f1d8142
@ -58,9 +58,10 @@ let
|
|||||||
cd build
|
cd build
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = ''
|
cmakeFlags = [
|
||||||
-C ../backends/all.cmake -C ../targets/all.cmake ..
|
"-C../backends/all.cmake"
|
||||||
'';
|
"-C../targets/all.cmake"
|
||||||
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# syntax error when eval'd directly
|
# syntax error when eval'd directly
|
||||||
|
@ -13,7 +13,7 @@ mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ cmake qttranslations ];
|
nativeBuildInputs = [ cmake qttranslations ];
|
||||||
propagatedBuildInputs = [ qtsvg qtwebengine ];
|
propagatedBuildInputs = [ qtsvg qtwebengine ];
|
||||||
cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0";
|
cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "ePub XHTML Visual Editor";
|
description = "ePub XHTML Visual Editor";
|
||||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Disable warnings that are irrelevant to us as packagers
|
# 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
|
# We run one of the executables we build while the build is
|
||||||
# still running (and patchelf hasn't been invoked) which means
|
# still running (and patchelf hasn't been invoked) which means
|
||||||
|
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}";
|
cmakeFlags = [ "-DPROJECT_ARCH=${platformInfo.projectArch}" ];
|
||||||
makeFlags = [ "libcef_dll_wrapper" ];
|
makeFlags = [ "libcef_dll_wrapper" ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user