build: fix 32bit builds

This commit is contained in:
Marcin Kuzminski 2019-02-04 17:17:56 +01:00
parent 319806b685
commit 2b56500039
2 changed files with 10 additions and 5 deletions

View file

@ -19,14 +19,15 @@
# }
args@
{ pythonPackages ? "python27Packages"
{ system ? builtins.currentSystem
, pythonPackages ? "python27Packages"
, pythonExternalOverrides ? self: super: {}
, doCheck ? false
, ...
}:
let
pkgs_ = (import <nixpkgs> {});
pkgs_ = args.pkgs or (import <nixpkgs> { inherit system; });
in
let
@ -80,7 +81,8 @@ let
nodeEnv = import ./pkgs/node-default.nix {
inherit
pkgs;
pkgs
system;
};
nodeDependencies = nodeEnv.shell.nodeDependencies;

View file

@ -1,12 +1,15 @@
# This file defines how to "build" for packaging.
{ doCheck ? false
{ pkgs ? import <nixpkgs> {}
, system ? builtins.currentSystem
, doCheck ? false
}:
let
enterprise_ce = import ./default.nix {
inherit
doCheck;
doCheck
system;
# disable checkPhase for build
checkPhase = ''