From faa64f72447c26706e2c15c02f70443c7b325091 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 16 May 2019 16:31:45 +1000 Subject: stage: fix multicore tagging to work with derivation overriding --- default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 03869bc..575d176 100644 --- a/default.nix +++ b/default.nix @@ -75,8 +75,8 @@ let # Export nixpkgs and standard library lib pkgs = nixpkgs; lib = nixpkgs.lib // { types = types; shard = callBionix ./lib/shard.nix {};}; - stage = x@{ name, stripStorePaths ? true, ... }: - (if stripStorePaths then strip else x: x) ({ multicore = false; } // nixpkgs.stdenvNoCC.mkDerivation (x // {name = "bionix-" + name; })); + stage = x@{ name, stripStorePaths ? true, multicore ? false, ... }: + (if stripStorePaths then strip else x: x) (nixpkgs.stdenvNoCC.mkDerivation (x // {name = "bionix-" + name; inherit multicore;})); strip = drv: drv.overrideAttrs (attrs: { buildCommand = attrs.buildCommand + '' @@ -96,7 +96,7 @@ let rewriteOutput $o done ''; - }); + }); # splitting/joining splitFile = file: drv: stage { -- cgit v1.2.3