aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-29 11:35:07 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-29 11:35:07 +0200
commit0f754280a4c2a8b57a85567dfeb72baf26123fc7 (patch)
tree9c8b90ef4bb07a50295a4c96b3c43b4930b08960
parent3b81b2645706d7f8d9c0ec228426dee8ef1fc7ac (diff)
parentc89783b6a7819c46bc00cb40686afdf37cb5e736 (diff)
Merge pull request #864 from copumpkin/remove-hack
Kill the temporary darwin-specific channel
-rw-r--r--release.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/release.nix b/release.nix
index 79df103cc..29c6d5a6b 100644
--- a/release.nix
+++ b/release.nix
@@ -77,8 +77,7 @@ let
build = pkgs.lib.genAttrs systems (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; };
+ with import <nixpkgs> { inherit system; };
releaseTools.nixBuild {
name = "nix";
@@ -113,7 +112,7 @@ let
binaryTarball = pkgs.lib.genAttrs systems (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; };
+ with import <nixpkgs> { inherit system; };
let
toplevel = builtins.getAttr system jobs.build;