From 51e5f8af42cd51bcf3cb5c86796bca4c5af02365 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 21:52:38 -0500 Subject: treewide: don’t set CMAKE_SYSTEM_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/text/html-tidy/default.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'pkgs/tools/text') diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 51ce4baa0beb..fcdba6cbba48 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -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 -- cgit 1.4.1 From a5de0ca963288ea3b227f28c9b4522f342e9faeb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 23:19:34 -0500 Subject: treewide: preserve hashes avoid mass rebuild from the last commits --- pkgs/development/libraries/boost/generic.nix | 2 ++ pkgs/tools/compression/brotli/default.nix | 2 ++ pkgs/tools/text/html-tidy/default.nix | 2 ++ 3 files changed, 6 insertions(+) (limited to 'pkgs/tools/text') diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 35703c282af0..bb8dff83d321 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation { inherit src; + patchFlags = ""; + patches = patches ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 3b4d5519028b..7047eeeefa61 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = []; + outputs = [ "out" "dev" "lib" ]; doCheck = true; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index fcdba6cbba48..1974c0aa4f36 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; + cmakeFlags = []; + # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 -- cgit 1.4.1