build: fix 32bit builds
This commit is contained in:
parent
319806b685
commit
2b56500039
2 changed files with 10 additions and 5 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue