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

treewide: don’t set CMAKE_SYSTEM_NAME

Browse Source
This commit is contained in:
Matthew Bauer 2018-10-16 21:52:38 -05:00
parent 0397453f1a
commit 51e5f8af42
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/msgpack/generic.nix
View File

@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
cmakeFlags = []
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"-DMSGPACK_BUILD_EXAMPLES=OFF"
++ stdenv.lib.optional (stdenv.hostPlatform.libc == "msvcrt")
"-DCMAKE_SYSTEM_NAME=Windows"
;
meta = with stdenv.lib; {

2
pkgs/development/libraries/nlohmann_json/default.nix
View File

@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBuildTests=${if doCheck then "ON" else "OFF"}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
"-DCMAKE_SYSTEM_NAME=Windows"
];
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;

4
pkgs/tools/compression/brotli/default.nix
View File

@ -15,9 +15,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = stdenv.lib.optional
(stdenv.hostPlatform.libc == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
outputs = [ "out" "dev" "lib" ];
doCheck = true;
@ -59,4 +56,3 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
};
}

3
pkgs/tools/text/html-tidy/default.nix
View File

@ -13,9 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
cmakeFlags = stdenv.lib.optional
(stdenv.hostPlatform.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
# ATM bin/tidy is statically linked, as upstream provides no other option yet.
# https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107