public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make callPackage_i686 fail on on-x86

Browse Source 
...instead of silently producing an i686 derivation.
This commit is contained in:
Tuomas Tynkkynen 2017-12-03 17:17:34 +02:00
parent 5ab47ccfd1
commit 17218f0bac
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -27,7 +27,9 @@ with pkgs;
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = forceSystem "i686-linux" "i386"; 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, # A stdenv capable of building 32-bit binaries. On x86_64-linux,
# it uses GCC compiled with multilib support; on i686-linux, it's # it uses GCC compiled with multilib support; on i686-linux, it's