##// END OF EJS Templates
build: fix 32bit builds
marcink -
r3449:7c3af07c default
parent child
Show More
@@ -19,14 +19,15
19 19 # }
20 20
21 21 args@
22 { pythonPackages ? "python27Packages"
22 { system ? builtins.currentSystem
23 , pythonPackages ? "python27Packages"
23 24 , pythonExternalOverrides ? self: super: {}
24 25 , doCheck ? false
25 26 , ...
26 27 }:
27 28
28 29 let
29 pkgs_ = (import <nixpkgs> {});
30 pkgs_ = args.pkgs or (import <nixpkgs> { inherit system; });
30 31 in
31 32
32 33 let
@@ -80,7 +81,8 let
80 81
81 82 nodeEnv = import ./pkgs/node-default.nix {
82 83 inherit
83 pkgs;
84 pkgs
85 system;
84 86 };
85 87 nodeDependencies = nodeEnv.shell.nodeDependencies;
86 88
@@ -1,12 +1,15
1 1 # This file defines how to "build" for packaging.
2 2
3 { doCheck ? false
3 { pkgs ? import <nixpkgs> {}
4 , system ? builtins.currentSystem
5 , doCheck ? false
4 6 }:
5 7
6 8 let
7 9 enterprise_ce = import ./default.nix {
8 10 inherit
9 doCheck;
11 doCheck
12 system;
10 13
11 14 # disable checkPhase for build
12 15 checkPhase = ''
General Comments 0
You need to be logged in to leave comments. Login now