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

knightos: reduce build time dependency graph

Browse Source 
Using asciidoc-full was unnecessary to build KnightOS-related packages
since only the a2x command matters. This change makes
cross-compilation far more noticeably faster. Closure size for each
package reduced from around 7 MB to 2 MB.
This commit is contained in:
Ben Siraphob 2021-02-17 15:21:41 +07:00
parent bf11a28bd3
commit d03a9c48fb
10 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/knightos/genkfs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: { lib, stdenv, fetchFromGitHub, asciidoc, cmake, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "genkfs"; pname = "genkfs";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp";
}; };
nativeBuildInputs = [ asciidoc cmake ]; strictDeps = true;
nativeBuildInputs = [ asciidoc libxslt.bin cmake ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

4
pkgs/development/tools/knightos/kcc/default.nix
View File

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp";
}; };
nativeBuildInputs = [ cmake bison flex ]; strictDeps = true;
nativeBuildInputs = [ bison cmake flex ];
buildInputs = [ boost ]; buildInputs = [ boost ];

6
pkgs/development/tools/knightos/kimg/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: { lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kimg"; pname = "kimg";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
}; };
nativeBuildInputs = [ cmake asciidoc ]; strictDeps = true;
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

6
pkgs/development/tools/knightos/kpack/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: { lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kpack"; pname = "kpack";
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8";
}; };
nativeBuildInputs = [ cmake ]; strictDeps = true;
buildInputs = [ asciidoc libxslt.bin docbook_xsl ]; nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];

8
pkgs/development/tools/knightos/mkrom/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: { lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mkrom"; pname = "mkrom";
@ -11,10 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2"; sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2";
}; };
nativeBuildInputs = [ strictDeps = true;
asciidoc nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
cmake
];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

6
pkgs/development/tools/knightos/mktiupgrade/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: { lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mktiupgrade"; pname = "mktiupgrade";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm"; sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm";
}; };
nativeBuildInputs = [ asciidoc cmake ]; strictDeps = true;
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

6
pkgs/development/tools/knightos/patchrom/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: { lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv"; sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv";
}; };
nativeBuildInputs = [ cmake asciidoc docbook_xsl ]; strictDeps = true;
buildInputs = [ libxslt ]; nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

2
pkgs/development/tools/knightos/scas/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
strictDeps = true;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta = with lib; { meta = with lib; {

4
pkgs/development/tools/knightos/z80e/default.nix
View File

@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc=";
}; };
nativeBuildInputs = [ cmake knightos-scas ]; nativeBuildInputs = [ cmake ];
buildInputs = [ readline SDL2 ]; buildInputs = [ readline SDL2 knightos-scas ];
cmakeFlags = [ "-Denable-sdl=YES" ]; cmakeFlags = [ "-Denable-sdl=YES" ];

16
pkgs/top-level/all-packages.nix
View File

@ -10427,27 +10427,19 @@ in
jwasm = callPackage ../development/compilers/jwasm { }; jwasm = callPackage ../development/compilers/jwasm { };
knightos-genkfs = callPackage ../development/tools/knightos/genkfs { knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };
asciidoc = asciidoc-full;
};
knightos-kcc = callPackage ../development/tools/knightos/kcc { }; knightos-kcc = callPackage ../development/tools/knightos/kcc { };
knightos-kimg = callPackage ../development/tools/knightos/kimg { knightos-kimg = callPackage ../development/tools/knightos/kimg { };
asciidoc = asciidoc-full;
};
knightos-kpack = callPackage ../development/tools/knightos/kpack { }; knightos-kpack = callPackage ../development/tools/knightos/kpack { };
knightos-mkrom = callPackage ../development/tools/knightos/mkrom { knightos-mkrom = callPackage ../development/tools/knightos/mkrom { };
asciidoc = asciidoc-full;
};
knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; knightos-patchrom = callPackage ../development/tools/knightos/patchrom { };
knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { };
asciidoc = asciidoc-full;
};
knightos-scas = callPackage ../development/tools/knightos/scas { }; knightos-scas = callPackage ../development/tools/knightos/scas { };