dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #113378 from siraben/knightos-build-graph-reduction

Browse Source 
knightos: reduce build time dependency graph
This commit is contained in:
Daniël de Kok 2021-02-17 16:42:53 +01:00 committed by GitHub
commit f1bb633034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
pname = "genkfs";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp";
};
nativeBuildInputs = [ asciidoc cmake ];
strictDeps = true;
nativeBuildInputs = [ asciidoc libxslt.bin cmake ];
hardeningDisable = [ "format" ];

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

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp";
};
nativeBuildInputs = [ cmake bison flex ];
strictDeps = true;
nativeBuildInputs = [ bison cmake flex ];
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 {
pname = "kimg";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
};
nativeBuildInputs = [ cmake asciidoc ];
strictDeps = true;
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
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 {
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" ];

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 {
pname = "mkrom";
@ -11,10 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2";
};
nativeBuildInputs = [
asciidoc
cmake
];
strictDeps = true;
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
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 {
pname = "mktiupgrade";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm";
};
nativeBuildInputs = [ asciidoc cmake ];
strictDeps = true;
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
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 {
@ -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" ];

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

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
strictDeps = true;
nativeBuildInputs = [ cmake ];
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=";
};
nativeBuildInputs = [ cmake knightos-scas ];
nativeBuildInputs = [ cmake ];
buildInputs = [ readline SDL2 ];
buildInputs = [ readline SDL2 knightos-scas ];
cmakeFlags = [ "-Denable-sdl=YES" ];

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

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