mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

idk

Browse Source
This commit is contained in:
mjallen18
2025-12-29 10:49:59 -06:00
parent 8fbf8c54eb
commit 462494277a
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
modules/nixos/nix/default.nix
View File

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