Skip to content

Commit

Permalink
Merge pull request #4194 from Ericson2314/skip-bad-static
Browse files Browse the repository at this point in the history
No x86_32 static nix jobs for now
  • Loading branch information
edolstra committed Oct 28, 2020
2 parents 02a1fac + 82e4d2a commit 5ac911b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions flake.nix
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 5ac911b

Please sign in to comment.