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

cross compilation: disable the (previously universal) ccache

Browse Source 
maybe i will re-enable it on select packages in the future
This commit is contained in:
Colin 2023-03-14 21:24:09 +00:00
parent 1be7119b73
commit 40b26fc57e
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hosts/common/cross/default.nix
View File

@ -333,34 +333,34 @@ in
; ;
}) })
(next: prev: lib.optionalAttrs ( # (next: prev: lib.optionalAttrs (
# we want to affect only the final bootstrap stage, identified by: # # we want to affect only the final bootstrap stage, identified by:
# - buildPlatform = local, # # - buildPlatform = local,
# - targetPlatform = cross, # # - targetPlatform = cross,
# - hostPlatform = cross # # - hostPlatform = cross
# and specifically in the event of `pkgsCross` sets -- e.g. the `pkgsCross.wasi32` used by firefox # # and specifically in the event of `pkgsCross` sets -- e.g. the `pkgsCross.wasi32` used by firefox
# -- we want to *not* override the stdenv. it's theoretically possible, but doing so breaks firefox. # # -- we want to *not* override the stdenv. it's theoretically possible, but doing so breaks firefox.
prev.stdenv.buildPlatform != prev.stdenv.hostPlatform && # prev.stdenv.buildPlatform != prev.stdenv.hostPlatform &&
prev.stdenv.hostPlatform == prev.stdenv.targetPlatform && # prev.stdenv.hostPlatform == prev.stdenv.targetPlatform &&
prev.stdenv.hostPlatform == config.nixpkgs.hostPlatform # prev.stdenv.hostPlatform == config.nixpkgs.hostPlatform
) { # ) {
# XXX: stdenv.cc is the cc-wrapper, from <nixpkgs:pkgs/build-support/cc-wrapper/default.nix>. # # XXX: stdenv.cc is the cc-wrapper, from <nixpkgs:pkgs/build-support/cc-wrapper/default.nix>.
# always the same. # # always the same.
# stdenv.cc.cc is either the real gcc (for buildPackages.stdenv), or the ccache (for normal stdenv). # # stdenv.cc.cc is either the real gcc (for buildPackages.stdenv), or the ccache (for normal stdenv).
stdenv = prev.stdenv.override { # stdenv = prev.stdenv.override {
cc = prev.stdenv.cc.override { # cc = prev.stdenv.cc.override {
# cc = prev.buildPackages.ccacheWrapper; # # cc = prev.buildPackages.ccacheWrapper;
cc = (prev.buildPackages.ccacheWrapper.override { # cc = (prev.buildPackages.ccacheWrapper.override {
cc = prev.stdenv.cc; # cc = prev.stdenv.cc;
}).overrideAttrs (_orig: { # }).overrideAttrs (_orig: {
# some things query stdenv.cc.cc.version, etc (rarely), so pass those through # # some things query stdenv.cc.cc.version, etc (rarely), so pass those through
passthru = prev.stdenv.cc.cc; # passthru = prev.stdenv.cc.cc;
}); # });
}; # };
}; # };
# stdenv = prev.buildPackages.ccacheStdenv; # # stdenv = prev.buildPackages.ccacheStdenv;
# stdenv = prev.ccacheStdenv.override { inherit (prev) stdenv; }; # # stdenv = prev.ccacheStdenv.override { inherit (prev) stdenv; };
}) # })
(nativeSelf: nativeSuper: { (nativeSelf: nativeSuper: {
pkgsi686Linux = nativeSuper.pkgsi686Linux.extend (i686Self: i686Super: { pkgsi686Linux = nativeSuper.pkgsi686Linux.extend (i686Self: i686Super: {