This commit is contained in:
mjallen18
2025-12-29 10:49:59 -06:00
parent 8fbf8c54eb
commit 462494277a

View File

@@ -5,6 +5,9 @@
namespace,
...
}:
let
gpuTargets = [ "gfx1102" ]; # todo update when support is added gfx1150
in
{
programs.ccache = {
enable = true;
@@ -59,7 +62,6 @@
"sdl"
"sdl2"
"sdl3"
"torch"
"uv"
"webkitgtk"
];
@@ -107,13 +109,28 @@
# todo: make these work
(_self: super: {
rocmPackages = super.rocmPackages // {
hipblaslt = super.rocmPackages.hipblaslt.override {
stdenv = super.ccacheStdenv;
gpuTargets = [ "gfx1102" ];
};
rocmPackages = super.stable.rocmPackages;
piper-tts = super.stable.piper-tts;
python3Packages = super.python3Packages // {
torch = super.stable.python3Packages.torch;
};
})
# (_self: super: {
# rocmPackages = super.rocmPackages // {
# hipblaslt = super.rocmPackages.hipblaslt.override {
# stdenv = super.ccacheStdenv;
# inherit gpuTargets;
# };
# rocblas = super.rocmPackages.rocblas.override {
# # stdenv = super.ccacheStdenv;
# inherit gpuTargets;
# };
# rocsolver = super.rocmPackages.rocsolver.override {
# # stdenv = super.ccacheStdenv;
# inherit gpuTargets;
# };
# };
# })
(_self: super: {
pcsx2 = super.pcsx2.override {
llvmPackages = super.llvmPackages // {
@@ -125,7 +142,9 @@
driversi686Linux = super.driversi686Linux // {
mesa = super.driversi686Linux.mesa.override {
stdenv = super.ccacheStdenv;
buildPackages.stdenv = super.ccacheStdenv;
buildPackages = super.driversi686Linux.mesa.buildPackages // {
stdenv = super.ccacheStdenv;
};
};
};
})
@@ -137,22 +156,19 @@
qtwebengine = super.stable.kdePackages.qtwebengine; #.override { stdenv = super.ccacheStdenv; };
};
})
(_self: super: {
python3Packages = super.python3Packages // {
torch = super.python3Packages.torch.override {
stdenv = super.ccacheStdenv;
gpuTargets = [ "gfx1102" ];
};
};
})
(_self: super: {
piper-tts = super.piper-tts.overridePythonAttrs (oldAttrs: {
optional-dependencies = oldAttrs.optional-dependencies ++ [
# Force using the same torch as lightning
oldAttrs.finalPackage.passthru.python.pkgs.lightning.torch
];
});
})
# (_self: super: {
# python3Packages = super.python3Packages // {
# torch = super.python3Packages.torch.override {
# stdenv = super.ccacheStdenv;
# inherit gpuTargets;
# };
# };
# })
# (_self: super: {
# piper-tts = super.piper-tts.overridePythonAttrs (oldAttrs: {
# pythonCatchConflictsPhase = null;
# });
# })
];
nix = {