diff options
author | Daniƫl de Kok <me@danieldk.eu> | 2021-02-17 16:42:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-17 16:42:53 +0100 |
commit | f1bb633034222cc151d92dffe9dba438016c9e68 (patch) | |
tree | 28788498a503cf6d218db836fe0361f5241ef24c /pkgs/development/tools | |
parent | 3df15d03be45792e669c54619bde9341771cd821 (diff) | |
parent | d03a9c48fba6addd5a12ae36e0f077ace6826c5c (diff) |
Merge pull request #113378 from siraben/knightos-build-graph-reduction
knightos: reduce build time dependency graph
Diffstat (limited to 'pkgs/development/tools')
9 files changed, 28 insertions, 20 deletions
diff --git a/pkgs/development/tools/knightos/genkfs/default.nix b/pkgs/development/tools/knightos/genkfs/default.nix index 9f553aa6bae3e..fc13b68258abe 100644 --- a/pkgs/development/tools/knightos/genkfs/default.nix +++ b/pkgs/development/tools/knightos/genkfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, asciidoc, cmake, libxslt }: stdenv.mkDerivation rec { pname = "genkfs"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; }; - nativeBuildInputs = [ asciidoc cmake ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc libxslt.bin cmake ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix index 5f047d79a1381..90a493697c8a5 100644 --- a/pkgs/development/tools/knightos/kcc/default.nix +++ b/pkgs/development/tools/knightos/kcc/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; }; - nativeBuildInputs = [ cmake bison flex ]; + strictDeps = true; + + nativeBuildInputs = [ bison cmake flex ]; buildInputs = [ boost ]; diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix index 33ec5b8bbb2ad..70eea0f7b6a4f 100644 --- a/pkgs/development/tools/knightos/kimg/default.nix +++ b/pkgs/development/tools/knightos/kimg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; }; - nativeBuildInputs = [ cmake asciidoc ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix index 43a8e4eddfa8c..447959a1e6129 100644 --- a/pkgs/development/tools/knightos/kpack/default.nix +++ b/pkgs/development/tools/knightos/kpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: stdenv.mkDerivation rec { pname = "kpack"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; }; - nativeBuildInputs = [ cmake ]; + strictDeps = true; - buildInputs = [ asciidoc libxslt.bin docbook_xsl ]; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix index b1ee36ac2dab3..2e067e92d9190 100644 --- a/pkgs/development/tools/knightos/mkrom/default.nix +++ b/pkgs/development/tools/knightos/mkrom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "mkrom"; @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2"; }; - nativeBuildInputs = [ - asciidoc - cmake - ]; + strictDeps = true; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/knightos/mktiupgrade/default.nix b/pkgs/development/tools/knightos/mktiupgrade/default.nix index a91d1e5beda86..efe8d454b2c45 100644 --- a/pkgs/development/tools/knightos/mktiupgrade/default.nix +++ b/pkgs/development/tools/knightos/mktiupgrade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "mktiupgrade"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm"; }; - nativeBuildInputs = [ asciidoc cmake ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/knightos/patchrom/default.nix b/pkgs/development/tools/knightos/patchrom/default.nix index 33ed8d38c63d6..67d7159e50215 100644 --- a/pkgs/development/tools/knightos/patchrom/default.nix +++ b/pkgs/development/tools/knightos/patchrom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: stdenv.mkDerivation rec { @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv"; }; - nativeBuildInputs = [ cmake asciidoc docbook_xsl ]; + strictDeps = true; - buildInputs = [ libxslt ]; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index 573d261306a60..eb0ab9621770e 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; + strictDeps = true; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/development/tools/knightos/z80e/default.nix index 6d66f141e9122..b8aa281d413db 100644 --- a/pkgs/development/tools/knightos/z80e/default.nix +++ b/pkgs/development/tools/knightos/z80e/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; }; - nativeBuildInputs = [ cmake knightos-scas ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ readline SDL2 ]; + buildInputs = [ readline SDL2 knightos-scas ]; cmakeFlags = [ "-Denable-sdl=YES" ]; |