maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #864 from copumpkin/remove-hack

Browse source 
Kill the temporary darwin-specific channel
This commit is contained in:
Eelco Dolstra 2016-03-29 11:35:07 +02:00
commit 0f754280a4
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
release.nix
View file

@ -77,8 +77,7 @@ let
build = pkgs.lib.genAttrs systems (system: build = pkgs.lib.genAttrs systems (system:
# FIXME: temporarily use a different branch for the Darwin build. with import <nixpkgs> { inherit system; };
with import (if system == "x86_64-darwin" then <nixpkgs-darwin> else <nixpkgs>) { inherit system; };
releaseTools.nixBuild { releaseTools.nixBuild {
name = "nix"; name = "nix";
@ -113,7 +112,7 @@ let
binaryTarball = pkgs.lib.genAttrs systems (system: binaryTarball = pkgs.lib.genAttrs systems (system:
# FIXME: temporarily use a different branch for the Darwin build. # 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 let
toplevel = builtins.getAttr system jobs.build; toplevel = builtins.getAttr system jobs.build;