2
0
Fork 0

Flatten upstream source

This commit is contained in:
Emery Hemingway 2019-11-15 08:59:46 +01:00
parent c3f716aafc
commit 206b86a5ae
1 changed files with 27 additions and 11 deletions

View File

@ -18,8 +18,7 @@ let
++ lib.optional isx86_32 "x86_32"
++ lib.optional isx86_64 "x86_64";
buildRepo = repo:
buildRepo = { repo, repoInputs }:
let
tupArch = with stdenv.targetPlatform;
if isAarch32 then "arm" else
@ -40,13 +39,18 @@ let
src = fetchgit {
url = "https://git.sr.ht/~ehmry/genode";
rev = "1dc25293b84fb3aed880bb4315adc7ce321c6343";
sha256 = "1jqbc1i4hwi6aai728mz8wmbcpm864v2mlkyg36lm118b7cpp493";
rev = "c6c7870a2956e8120bf5333a8588e5603540b136";
sha256 = "0xw0dhybjgj5y2cyw06i9hmjkn6ryl7pjrx5r9b3f659yn195f5q";
fetchSubmodules = false;
};
setupHook = ./../tool/setup-hooks.sh;
nativeBuildInputs = repoInputs;
# This is wrong, why does pkg-config not collect buildInputs?
propagatedNativeBuildInputs = repoInputs;
depsBuildBuild = with buildPackages; [ llvm pkgconfig tup ];
tupConfig = toTupConfig {
@ -135,11 +139,23 @@ let
};
in rec {
base = buildRepo "base";
base-linux = (buildRepo "base-linux").overrideAttrs
(attrs: { nativeBuildInputs = [ base ]; });
base-nova = (buildRepo "base-nova").overrideAttrs
(attrs: { nativeBuildInputs = [ base ]; });
os =
(buildRepo "os").overrideAttrs (attrs: { nativeBuildInputs = [ base ]; });
base = buildRepo {
repo = "base";
repoInputs = [ ];
};
base-linux = buildRepo {
repo = "base-linux";
repoInputs = [ base ];
};
base-nova = buildRepo {
repo = "base-nova";
repoInputs = [ base ];
};
os = buildRepo {
repo = "os";
repoInputs = [ base ];
};
}