diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-03 17:17:34 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-03 17:17:34 +0200 |
| commit | 17218f0bac909dc62bf9ed70238cbee62d9e44fd (patch) | |
| tree | 5972aba17678ab28670b7ccaaab84a766afc480d /pkgs/top-level | |
| parent | 5ab47ccfd1e58947f21040ee74d21410c6b5228b (diff) | |
| download | nixlib-17218f0bac909dc62bf9ed70238cbee62d9e44fd.tar nixlib-17218f0bac909dc62bf9ed70238cbee62d9e44fd.tar.gz nixlib-17218f0bac909dc62bf9ed70238cbee62d9e44fd.tar.bz2 nixlib-17218f0bac909dc62bf9ed70238cbee62d9e44fd.tar.lz nixlib-17218f0bac909dc62bf9ed70238cbee62d9e44fd.tar.xz nixlib-17218f0bac909dc62bf9ed70238cbee62d9e44fd.tar.zst nixlib-17218f0bac909dc62bf9ed70238cbee62d9e44fd.zip | |
Make callPackage_i686 fail on on-x86
...instead of silently producing an i686 derivation.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fc1f4581748..f549e571abe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27,7 +27,9 @@ with pkgs; # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = forceSystem "i686-linux" "i386"; - callPackage_i686 = pkgsi686Linux.callPackage; + callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + then pkgsi686Linux.callPackage + else throw "callPackage_i686 not supported on system '${stdenv.system}'"; # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's |