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

cross: emulateBuildMachine -> buildInQemu

Browse Source
This commit is contained in:
Colin 2023-08-13 07:41:45 +00:00
parent c69fb690f1
commit 7a612b701d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
overlays/cross.nix
View File

@ -1426,23 +1426,23 @@ in {
# # so to modify `qtModule` we have to go through callPackage. # # so to modify `qtModule` we have to go through callPackage.
# callPackage = self.newScope { # callPackage = self.newScope {
# inherit (self) qtCompatVersion srcs stdenv; # inherit (self) qtCompatVersion srcs stdenv;
# qtModule = args: emulateBuildMachine { # qtModule = args: buildInQemu {
# # clunky emulateBuildMachine API, when not used via `callPackage` # # clunky buildInQemu API, when not used via `callPackage`
# override = _attrs: super.qtModule args; # override = _attrs: super.qtModule args;
# }; # };
# }; # };
# # emulate qtbase (which doesn't go through qtModule) # # emulate qtbase (which doesn't go through qtModule)
# qtbase = emulateBuildMachine super.qtbase; # qtbase = buildInQemu super.qtbase;
# }); # });
# qt5 = prev.qt5.overrideScope (self: super: # qt5 = prev.qt5.overrideScope (self: super:
# let # let
# emulateQtModule = pkg: emulateBuildMachine { # emulateQtModule = pkg: buildInQemu {
# # qtModule never gets `stdenv` # # qtModule never gets `stdenv`
# override = _stdenv: pkg; # override = _stdenv: pkg;
# }; # };
# in { # in {
# qtbase = emulateBuildMachine super.qtbase; # qtbase = buildInQemu super.qtbase;
# qtdeclarative = emulateQtModule super.qtdeclarative; # qtdeclarative = emulateQtModule super.qtdeclarative;
# qtgraphicaleffects = emulateQtModule super.qtgraphicaleffects; # qtgraphicaleffects = emulateQtModule super.qtgraphicaleffects;
# qtimageformats = emulateQtModule super.qtimageformats; # qtimageformats = emulateQtModule super.qtimageformats;