diff --git a/README.md b/README.md
index f45b447..0e1116a 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,11 @@
 [Nix](https://nixos.org/nix/) expressions related to the
 [Genode OS framework](https://genode.org).
 
+# Packaging
+
+Packaging is done using standard Nixpkgs methods, a `stdenv` is available for 
+cross-compilation. See [Solo5](./packages/solo5/default.nix) as an example.
+
 # System description format
 
 The high-level interface to system building are boot descriptions. These Dhall 
diff --git a/packages/default.nix b/packages/default.nix
index 693f9d6..6016a74 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -37,7 +37,7 @@ in rec {
 
   nic_bus = callPackage ./nic_bus { inherit (genode) base os; };
 
-  solo5 = let drv = callPackage' ./solo5 { inherit (genode) base os; };
+  solo5 = let drv = callPackage' ./solo5 { inherit genode; };
   in drv // { tests = addManifest drv.tests // { pname = "solo5-tests"; }; };
 
   sotest-producer = callPackage' ./sotest-producer {
diff --git a/packages/solo5/default.nix b/packages/solo5/default.nix
index 6b2f275..34b2559 100644
--- a/packages/solo5/default.nix
+++ b/packages/solo5/default.nix
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: CC0-1.0
 
-{ stdenv, buildPackages, fetchurl, llvmPackages, pkgconfig, base, os }:
+{ stdenv, buildPackages, fetchurl, pkgconfig, base, os }:
 
-# WARNING: recursive make, fucked as usual
+# WARNING: recursive make ahead
 
 let version = "0.6.3";
 in stdenv.mkDerivation {
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ base os ];
+  buildInputs = [ genode.base genode.os ];
 
   src = fetchurl {
     url =