From 4202b17666d4ccba825e204e142bc7e294a3ec86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Jan 2016 10:48:48 +0100
Subject: [PATCH] Temporarily do Darwin builds from a different Nixpkgs branch
---
release.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/release.nix b/release.nix
index a6a745e27..293afcc24 100644
--- a/release.nix
+++ b/release.nix
@@ -76,7 +76,8 @@ let
build = pkgs.lib.genAttrs systems (system:
- with import <nixpkgs> { inherit system; };
+ # FIXME: temporarily use a different branch for the Darwin build.
+ with import (if system == "x86_64-darwin" then <nixpkgs-darwin> else <nixpkgs>) { inherit system; };
releaseTools.nixBuild {
name = "nix";
@@ -110,7 +111,8 @@ let
binaryTarball = pkgs.lib.genAttrs systems (system:
- with import <nixpkgs> { inherit system; };
+ # FIXME: temporarily use a different branch for the Darwin build.
+ with import (if system == "x86_64-darwin" then <nixpkgs-darwin> else <nixpkgs>) { inherit system; };
let
toplevel = builtins.getAttr system jobs.build;
--
GitLab