diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-03-19T10·57+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-03-19T10·57+0100 |
| commit | 44a1b6c0264556d2bc7ac312728421342d92490a (patch) | |
| tree | 72dacbcfa243b27438cecb9fc361ffb850de4ddf | |
| parent | 138af2e554871b83e23f13939314d7b749de2013 (diff) | |
Fix build on non-x86_64-linux
| -rw-r--r-- | release.nix | 6 | ||||
| -rw-r--r-- | shell.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/release.nix b/release.nix index 7db5e20e1e12..0dac174accd8 100644 --- a/release.nix +++ b/release.nix @@ -1,5 +1,5 @@ { nix ? builtins.fetchGit ./. -, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs.git; ref = "release-18.03"; } +, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03"; } , officialRelease ? false , systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] }: @@ -55,7 +55,9 @@ let build = pkgs.lib.genAttrs systems (system: - with import nixpkgs { inherit system; }; + let pkgs = import nixpkgs { inherit system; }; in + + with pkgs; with import ./release-common.nix { inherit pkgs; }; diff --git a/shell.nix b/shell.nix index 20cf4133b3f8..c04bcd151309 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,6 @@ { useClang ? false }: -with import (builtins.fetchGit { url = https://github.com/NixOS/nixpkgs.git; ref = "release-18.03"; }) {}; +with import (builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03"; }) {}; with import ./release-common.nix { inherit pkgs; }; |