summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-10-28 05:13:18 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-10-28 05:13:18 +0000
commit82e4d2a82ef11a95ff8e9aba3062db50145daab1 (patch)
tree4fac52464cfced2e54e734afb98c4f4def60d382
parent02a1facbdc89c5041ba55387645484ad785cba7a (diff)
No x86_32 static nix jobs for now
Fixes #4175
-rw-r--r--flake.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index 0233962b4..2abbdff53 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,8 @@
officialRelease = false;
- linuxSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
+ linux64BitSystems = [ "x86_64-linux" "aarch64-linux" ];
+ linuxSystems = linux64BitSystems ++ [ "i686-linux" ];
systems = linuxSystems ++ [ "x86_64-darwin" ];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
@@ -228,7 +229,7 @@
# Binary package for various platforms.
build = nixpkgs.lib.genAttrs systems (system: self.packages.${system}.nix);
- buildStatic = nixpkgs.lib.genAttrs linuxSystems (system: self.packages.${system}.nix-static);
+ buildStatic = nixpkgs.lib.genAttrs linux64BitSystems (system: self.packages.${system}.nix-static);
# Perl bindings for various platforms.
perlBindings = nixpkgs.lib.genAttrs systems (system: self.packages.${system}.nix.perl-bindings);
@@ -451,7 +452,7 @@
packages = forAllSystems (system: {
inherit (nixpkgsFor.${system}) nix;
- } // nixpkgs.lib.optionalAttrs (builtins.elem system linuxSystems) {
+ } // nixpkgs.lib.optionalAttrs (builtins.elem system linux64BitSystems) {
nix-static = let
nixpkgs = nixpkgsFor.${system}.pkgsStatic;
in with commonDeps nixpkgs; nixpkgs.stdenv.mkDerivation {