APply a nix override

This commit is contained in:
Graham Christensen 2020-05-25 22:10:17 -04:00
parent c661bb2669
commit 9540815f73
No known key found for this signature in database
GPG Key ID: FE918C3A98C1030F
2 changed files with 11 additions and 5 deletions

View File

@ -1,9 +1,15 @@
{ callPackage }: { callPackage, nixUnstable }:
{ {
# Create a cpio archive comprised of many initrd's appended to # Create a cpio archive comprised of many initrd's appended to
# each other. Harder to debug, and requires recursive Nix support, # each other. Harder to debug, and requires recursive Nix support,
# but faster for iterating. # but faster for iterating.
makeCpioRecursive = callPackage ./cpio-recursive {}; makeCpioRecursive = callPackage ./cpio-recursive {
# nixUnstable may not be required. Todo: revisit (2020-05-25)
nix = nixUnstable;
};
makeSquashfsManifest = callPackage ./squashfs-recursive {}; makeSquashfsManifest = callPackage ./squashfs-recursive {
# nixUnstable may not be required. Todo: revisit (2020-05-25)
nix = nixUnstable;
};
} }

View File

@ -1,10 +1,10 @@
{ runCommand, nixUnstable, jq, path }: { runCommand, nix, jq, path }:
let let
map-squash = ./map-squash.nix; map-squash = ./map-squash.nix;
mkSquashfsManifest = { name, storeContents, reverse ? false }: mkSquashfsManifest = { name, storeContents, reverse ? false }:
runCommand "${name}-squashfs-manifest" { runCommand "${name}-squashfs-manifest" {
buildInputs = [ nixUnstable jq ]; buildInputs = [ nix jq ];
requiredSystemFeatures = [ "recursive-nix" ]; requiredSystemFeatures = [ "recursive-nix" ];
exportReferencesGraph = [ "root" storeContents ]; exportReferencesGraph = [ "root" storeContents ];
NIX_PATH = "nixpkgs=${path}"; NIX_PATH = "nixpkgs=${path}";