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

overlays/preferences: remove obsolete build fixs

Browse Source
This commit is contained in:
Colin
2025-03-19 07:02:15 +00:00
parent 9ebaefe7c2
commit 5532ecc12d
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
overlays/preferences.nix
View File

@@ -11,13 +11,13 @@ let
# the patch here ASSUMES THE BUILD MACHINE IS x86, and it works by forcing cc/bintools to be built as native packages, not gnu64 cross packages. # the patch here ASSUMES THE BUILD MACHINE IS x86, and it works by forcing cc/bintools to be built as native packages, not gnu64 cross packages.
# TODO: this is a hack and can hopefully be someday removed! # TODO: this is a hack and can hopefully be someday removed!
x86_64PkgsCrossToolchain = pkgs.pkgsBuildBuild; # x86_64PkgsCrossToolchain = pkgs.pkgsBuildBuild;
hare = pkgs.pkgsBuildTarget.hare.override { # hare = pkgs.pkgsBuildTarget.hare.override {
inherit x86_64PkgsCrossToolchain; # inherit x86_64PkgsCrossToolchain;
}; # };
crossHareHook = pkgs.hareHook.override { # crossHareHook = pkgs.hareHook.override {
inherit hare; # inherit hare;
}; # };
in in
{ {
# DISABLE HDCP BLOB in pinephone pro. # DISABLE HDCP BLOB in pinephone pro.
@@ -34,12 +34,12 @@ in
# }; # };
# }; # };
bonsai = super.bonsai.override { # bonsai = super.bonsai.override {
hareHook = crossHareHook; # hareHook = crossHareHook;
}; # };
bunpen = super.bunpen.override { # bunpen = super.bunpen.override {
hareHook = crossHareHook; # hareHook = crossHareHook;
}; # };
# XXX(2024-12-26): prefer pre-built electron because otherwise it takes 4 hrs to build from source. # XXX(2024-12-26): prefer pre-built electron because otherwise it takes 4 hrs to build from source.
# but wait 2 days after staging -> master merge, and normal electron should be cached and safe to remove # but wait 2 days after staging -> master merge, and normal electron should be cached and safe to remove
@@ -133,17 +133,17 @@ in
# samba = null; # samba = null;
# }; # };
haredoc = super.haredoc.override { # haredoc = super.haredoc.override {
hareHook = crossHareHook; # hareHook = crossHareHook;
}; # };
hareThirdParty = super.hareThirdParty.overrideScope (sself: ssuper: { # hareThirdParty = super.hareThirdParty.overrideScope (sself: ssuper: {
hare-ev = (ssuper.hare-ev.override { # hare-ev = (ssuper.hare-ev.override {
hareHook = crossHareHook; # hareHook = crossHareHook;
}).overrideAttrs { doCheck = false; }; # }).overrideAttrs { doCheck = false; };
hare-json = (ssuper.hare-json.override { # hare-json = (ssuper.hare-json.override {
hareHook = crossHareHook; # hareHook = crossHareHook;
}).overrideAttrs { doCheck = false; }; # }).overrideAttrs { doCheck = false; };
}); # });
# hare = pkgsBuildTarget.hare.override { # hare = pkgsBuildTarget.hare.override {
# x86_64PkgsCrossToolchain = super.pkgsBuildBuild; # x86_64PkgsCrossToolchain = super.pkgsBuildBuild;