pyrox.dev
Make callPackage_i686 fail on on-x86
...instead of silently producing an i686 derivation.
+3
-1
pkgs/top-level/all-packages.nix
+3
-1
pkgs/top-level/all-packages.nix
···
27
# Used by wine, firefox with debugging version of Flash, ...
28
pkgsi686Linux = forceSystem "i686-linux" "i386";
29
30
-
callPackage_i686 = pkgsi686Linux.callPackage;
31
32
# A stdenv capable of building 32-bit binaries. On x86_64-linux,
33
# it uses GCC compiled with multilib support; on i686-linux, it's
···
27
# Used by wine, firefox with debugging version of Flash, ...
28
pkgsi686Linux = forceSystem "i686-linux" "i386";
29
30
+
callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
31
+
then pkgsi686Linux.callPackage
32
+
else throw "callPackage_i686 not supported on system '${stdenv.system}'";
33
34
# A stdenv capable of building 32-bit binaries. On x86_64-linux,
35
# it uses GCC compiled with multilib support; on i686-linux, it's