# HG changeset patch # User Marcin Kuzminski # Date 2019-02-04 16:17:56 # Node ID 7c3af07c3c2adb5b4e60b46133b51a74f36396fa # Parent 51bb9d9f1e7e554bdba5641659f183de7fd478c5 build: fix 32bit builds diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -19,14 +19,15 @@ # } args@ -{ pythonPackages ? "python27Packages" +{ system ? builtins.currentSystem +, pythonPackages ? "python27Packages" , pythonExternalOverrides ? self: super: {} , doCheck ? false , ... }: let - pkgs_ = (import {}); + pkgs_ = args.pkgs or (import { inherit system; }); in let @@ -80,7 +81,8 @@ let nodeEnv = import ./pkgs/node-default.nix { inherit - pkgs; + pkgs + system; }; nodeDependencies = nodeEnv.shell.nodeDependencies; diff --git a/release.nix b/release.nix --- a/release.nix +++ b/release.nix @@ -1,12 +1,15 @@ # This file defines how to "build" for packaging. -{ doCheck ? false +{ pkgs ? import {} +, system ? builtins.currentSystem +, doCheck ? false }: let enterprise_ce = import ./default.nix { inherit - doCheck; + doCheck + system; # disable checkPhase for build checkPhase = ''