diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-10-28 11:16:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 11:16:00 +0100 |
| commit | 5ac911bad6e5760759bcb62772cac1ddc056b773 (patch) | |
| tree | 4fac52464cfced2e54e734afb98c4f4def60d382 | |
| parent | 02a1facbdc89c5041ba55387645484ad785cba7a (diff) | |
| parent | 82e4d2a82ef11a95ff8e9aba3062db50145daab1 (diff) | |
Merge pull request #4194 from Ericson2314/skip-bad-static
No x86_32 static nix jobs for now
| -rw-r--r-- | flake.nix | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 { |