ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Tweak Genode upstream build wrapper

20.02
Emery Hemingway 2020-02-24 14:19:57 +01:00
parent 94868758e5
commit 7f30ff1fed
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/default.nix
View File

@ -5,7 +5,8 @@
let
inherit (legacyPackages) callPackage;
dhallPackages = legacyPackages.dhallPackages // (callPackage ./dhall { inherit dhallApps; });
dhallPackages = legacyPackages.dhallPackages
// (callPackage ./dhall { inherit dhallApps; });
mkDhallManifest = drv:
legacyPackages.runCommand "${drv.name}.dhall" { inherit drv; }
@ -30,8 +31,7 @@ in rec {
arch = "x86_64";
kernel = "hw";
board = "pc";
targets = [ "bootstrap" "core" "timer" ];
libTargets = [ "ld-hw" ];
targets = [ "bootstrap" "core" "timer" "lib/ld" ];
postInstall = ''
mkdir -p $out/lib
mv $out/bin/*.o $out/lib/
@ -43,9 +43,7 @@ in rec {
name = "base-nova";
arch = "x86_64";
kernel = "nova";
board = "pc";
targets = [ "core" "timer" ];
libTargets = [ "ld-nova" ];
targets = [ "core" "timer" "lib/ld" ];
postInstall = ''
mkdir -p $out/lib
mv $out/bin/*.o $out/lib/

13
packages/genodelabs/default.nix
View File

@ -1,7 +1,6 @@
{ nixpkgs, apps }:
{ name, targets, libTargets ? [ ], arch ? "x86_64", kernel ? "linux"
, board ? "pc", ... }@extraAttrs:
{ name, targets, arch, kernel ? "hw", board ? "pc", patches ? [], ... }@extraAttrs:
let
sourceForgeToolchain =
nixpkgs.buildPackages.callPackage ./../genode/toolchain.nix { };
@ -17,7 +16,7 @@ let
in stdenvGcc.mkDerivation ({
outputs = [ "out" "manifest" ];
pname = name;
inherit version targets libTargets;
inherit version targets;
src = nixpkgs.fetchFromGitHub {
owner = "genodelabs";
repo = "genode";
@ -25,7 +24,7 @@ in stdenvGcc.mkDerivation ({
sha256 = "0j0wfwqmv8mivfkpra1pb02a8dy1nnsakr3v6l5y964dfkq3737i";
};
patches = [ ./unlabeled-log.patch ];
patches = [ ./unlabeled-log.patch ] ++ patches;
nativeBuildInputs = with nixpkgs.buildPackages; [ binutils tcl which ];
@ -39,6 +38,8 @@ in stdenvGcc.mkDerivation ({
substituteInPlace tool/check_abi \
--replace "exec nm" "exec ${toolPrefix}nm"
./tool/create_builddir ${arch} BUILD_DIR=build
substituteInPlace build/etc/build.conf \
--replace "#REPOSITORIES" "REPOSITORIES"
'';
makeFlags = [ "-C build" "KERNEL=${kernel}" "BOARD=${board}" ];
@ -51,15 +52,13 @@ in stdenvGcc.mkDerivation ({
$makeFlags ''${makeFlagsArray+"''${makeFlagsArray[@]}"}
$buildFlags ''${buildFlagsArray+"''${buildFlagsArray[@]}"}
)
for LIB in $libTargets; do
make "''${flagsArray[@]}" LIB=$LIB
done
make "''${flagsArray[@]}" $targets
runHook postBuild
'';
installPhase = ''
runHook preInstall
find -name '*.xsd' -delete
find build/bin -execdir install -Dt $out/bin '{}' \;
runHook postInstall
${apps.generate-manifest.program} $out > $manifest