colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: don't unnecessarily emulate pkgsi686Linux.tbb

Browse Source
This commit is contained in:
Colin 2023-07-31 03:13:26 +00:00
parent 206dd84477
commit 6f835db8f3
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
overlays/cross.nix
View File

@ -62,23 +62,23 @@ let
in { in {
inherit emulated; inherit emulated;
pkgsi686Linux = prev.pkgsi686Linux.extend (i686Self: i686Super: { # pkgsi686Linux = prev.pkgsi686Linux.extend (i686Self: i686Super: {
# fixes eval-time error: "Unsupported cross architecture" # # fixes eval-time error: "Unsupported cross architecture"
# it happens even on a x86_64 -> x86_64 build: # # it happens even on a x86_64 -> x86_64 build:
# - defining `config.nixpkgs.buildPlatform` to the non-default causes that setting to be inherited by pkgsi686. # # - defining `config.nixpkgs.buildPlatform` to the non-default causes that setting to be inherited by pkgsi686.
# - hence, `pkgsi686` on a non-cross build is ordinarily *emulated*: # # - hence, `pkgsi686` on a non-cross build is ordinarily *emulated*:
# defining a cross build causes it to also be cross (but to the right hostPlatform) # # defining a cross build causes it to also be cross (but to the right hostPlatform)
# this has no inputs other than stdenv, and fetchurl, so emulating it is fine. # # this has no inputs other than stdenv, and fetchurl, so emulating it is fine.
tbb = prev.emulated.pkgsi686Linux.tbb; # tbb = prev.emulated.pkgsi686Linux.tbb;
# tbb = i686Super.tbb.overrideAttrs (orig: (with i686Self; { # # tbb = i686Super.tbb.overrideAttrs (orig: (with i686Self; {
# makeFlags = lib.optionals stdenv.cc.isClang [ # # makeFlags = lib.optionals stdenv.cc.isClang [
# "compiler=clang" # # "compiler=clang"
# ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) # # ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
# (if stdenv.hostPlatform.isAarch64 then "arch=arm64" # # (if stdenv.hostPlatform.isAarch64 then "arch=arm64"
# else if stdenv.hostPlatform.isx86_64 then "arch=intel64" # # else if stdenv.hostPlatform.isx86_64 then "arch=intel64"
# else throw "Unsupported cross architecture: ${stdenv.buildPlatform.system} -> ${stdenv.hostPlatform.system}")); # # else throw "Unsupported cross architecture: ${stdenv.buildPlatform.system} -> ${stdenv.hostPlatform.system}"));
# })); # # }));
}); # });
# packages which don't cross compile # packages which don't cross compile
inherit (emulated) inherit (emulated)