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

overlays: remove dead optimizations overlay (old ccache stuff)

Browse Source
This commit is contained in:
Colin
2024-02-28 00:19:29 +00:00
parent 44067f6570
commit c73684557e
3 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@@ -203,7 +203,6 @@
pkgs = final: prev: import ./overlays/pkgs.nix final prev; pkgs = final: prev: import ./overlays/pkgs.nix final prev;
pins = final: prev: import ./overlays/pins.nix final prev; pins = final: prev: import ./overlays/pins.nix final prev;
preferences = final: prev: import ./overlays/preferences.nix final prev; preferences = final: prev: import ./overlays/preferences.nix final prev;
optimizations = final: prev: import ./overlays/optimizations.nix final prev;
passthru = final: prev: passthru = final: prev:
let let
mobile = (import "${mobile-nixos}/overlay/overlay.nix"); mobile = (import "${mobile-nixos}/overlay/overlay.nix");

2
overlays/all.nix
View File

@@ -6,7 +6,6 @@ final: prev:
let let
pkgs = import ./pkgs.nix; pkgs = import ./pkgs.nix;
preferences = import ./preferences.nix; preferences = import ./preferences.nix;
optimizations = import ./optimizations.nix;
cross = import ./cross.nix; cross = import ./cross.nix;
isCross = prev.stdenv.hostPlatform != prev.stdenv.buildPlatform; isCross = prev.stdenv.hostPlatform != prev.stdenv.buildPlatform;
@@ -19,6 +18,5 @@ in
renderOverlays [ renderOverlays [
pkgs pkgs
preferences preferences
(ifCross optimizations)
(ifCross cross) (ifCross cross)
] ]

33
overlays/optimizations.nix
View File

@@ -1,33 +0,0 @@
(self: super:
with self;
let
# ccache-able = drv: drv.override { stdenv = builtins.trace "with ccache ${drv.name}" ccacheStdenv; };
ccache-able = drv: drv.override { stdenv = builtins.trace "with ccache: ${drv.name}" ccacheStdenv; };
in {
# TODO: if we link /homeless-shelter/.ccache into the nix environment,
# then maybe we get better use of upstream caches?
# ccacheWrapper = super.ccacheWrapper.override {
# extraConfig = ''
# export CCACHE_DIR="/var/cache/ccache"
# '';
# };
# ccacheStdenv = super.ccacheStdenv.override {
# extraConfig = ''
# export CCACHE_DIR="/homeless-shelter/.ccache"
# '';
# };
# firefox-esr = ccache-able super.firefox-esr;
# firefox/librewolf distribution is wacky: it grabs the stdenv off of `rustc.llvmPackages`, and really wants those to match.
# buildMozillaMach = opts: ccache-able (super.buildMozillaMach opts);
# webkitgtk = ccache-able super.webkitgtk;
# mesa = ccache-able super.mesa;
# webkitgtk = super.webkitgtk.overrideAttrs (_upstream: {
# # means we drop debug info when linking.
# # this is a trade-off to require less memory when linking, since
# # building `webkitgtk` otherwise requires about 40G+ of RAM.
# # <https://github.com/NixOS/nixpkgs/issues/153528>
# # XXX(2023/06/29): doesn't seem to actually reduce the resource requirements
# separateDebugInfo = false;
# });
})