Use buildPackages where appropriate
This commit is contained in:
parent
99c0670abf
commit
532d6eec0f
|
@ -102,7 +102,7 @@ in rec {
|
||||||
novaImage = name:
|
novaImage = name:
|
||||||
{ gzip ? false, ... }@env:
|
{ gzip ? false, ... }@env:
|
||||||
boot:
|
boot:
|
||||||
pkgs.stdenv.mkDerivation {
|
pkgs.buildPackages.stdenv.mkDerivation {
|
||||||
name = name + "-nova-image";
|
name = name + "-nova-image";
|
||||||
build = compileBoot name env boot;
|
build = compileBoot name env boot;
|
||||||
|
|
||||||
|
|
|
@ -267,7 +267,7 @@ in {
|
||||||
|
|
||||||
# Create the tarball of the store to live in core ROM
|
# Create the tarball of the store to live in core ROM
|
||||||
system.build.tarball =
|
system.build.tarball =
|
||||||
pkgs.callPackage "${modulesPath}/../lib/make-system-tarball.nix" {
|
pkgs.buildPackages.callPackage "${modulesPath}/../lib/make-system-tarball.nix" {
|
||||||
extraInputs = lib.attrsets.mapAttrsToList (_: child: child.package)
|
extraInputs = lib.attrsets.mapAttrsToList (_: child: child.package)
|
||||||
config.genode.init.children;
|
config.genode.init.children;
|
||||||
contents = erisContents;
|
contents = erisContents;
|
||||||
|
|
Loading…
Reference in New Issue