WIP

default.nix

@@ -4,19 +4,22 @@
 #   nix-shell path/to/ghc.nix/        --run 'hadrian/build.sh -c -j4 --flavour=quickest'
 #   nix-shell path/to/ghc.nix/        --run 'THREADS=4 ./validate --slow'
 #
-{ nixpkgs   ? import ./nixpkgs.nix {}
+{ nixpkgsFun ? import ./nixpkgs.nix
+, crossSystem ? null
+, nixpkgs   ? nixpkgsFun { inherit crossSystem; }
 , bootghc   ? "ghc844"
 , version   ? "8.7"
 , useClang  ? false  # use Clang for C compilation
 , withLlvm  ? false
 , withDocs  ? true
-, withDwarf ? nixpkgs.stdenv.isLinux  # enable libdw unwinding support
-, withNuma  ? nixpkgs.stdenv.isLinux
+, withDwarf ? nixpkgs.stdenv.hostPlatform.isLinux  # enable libdw unwinding support
+, withNuma  ? nixpkgs.stdenv.hostPlatform.isLinux
 , mkFile    ? null
 , cores     ? 4
 }:
 
-with nixpkgs;
+# build = host =?= target
+with nixpkgs.buildPackages;
 
 let
     stdenv =
@@ -33,7 +36,7 @@ let
     fonts = nixpkgs.makeFontsConf { fontDirectories = [ nixpkgs.dejavu_fonts ]; };
     docsPackages = if withDocs then [ python3Packages.sphinx ourtexlive ] else [];
 
-    deps =
+    buildDeps =
       [ autoconf automake m4
         gmp.dev gmp.out glibcLocales
         ncurses.dev ncurses.out
@@ -46,15 +49,26 @@ let
       ]
       ++ docsPackages
       ++ stdenv.lib.optional withLlvm llvm_6
-      ++ stdenv.lib.optional withNuma numactl
+      ++ stdenv.lib.optional withNuma targetPackages.nugactl
       ++ stdenv.lib.optional withDwarf elfutils
       ++ stdenv.lib.optional (! stdenv.isDarwin) pxz ;
 
-    env = buildEnv {
+    runDeps =
+      [ gmp.dev gmp.out glibcLocales
+        ncurses.dev ncurses.out
+        zlib.out
+        zlib.dev
+      ];
+
+    buildEnv = buildEnv {
       name = "ghc-build-environment";
       paths = deps;
     };
 
+    runEnv = buildEnv {
+      name = "ghc-run-environment";
+      paths = deps;
+    };
 in
 
 stdenv.mkDerivation rec {