Skip to content

Commit cef3926

Browse files
committed
make default.nix usable more broadly
1 parent a9f4b57 commit cef3926

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
version = "6.17.6-1";
100100
linuxVersion = lib.head (lib.splitString "-" version);
101101
suffix = "nitrous";
102-
llvm = pkgs.unstable.llvmPackages_20;
102+
llvm = pkgs.llvmPackages_20;
103103
linux_nitrous_pkg =
104104
{ fetchurl, buildLinux, ... }@args:
105105
buildLinux (
@@ -108,7 +108,7 @@
108108
inherit version;
109109
pname = "linux-${suffix}";
110110
modDirVersion = lib.versions.pad 3 "${linuxVersion}-${suffix}";
111-
stdenv = pkgs.unstable.overrideCC llvm.stdenv (
111+
stdenv = pkgs.overrideCC llvm.stdenv (
112112
llvm.stdenv.cc.override { inherit (llvm) bintools; }
113113
);
114114
nativeBuildInputs = [ llvm.lld ];
@@ -175,7 +175,7 @@
175175
linux_nitrous = pkgs.callPackage linux_nitrous_pkg { };
176176
in
177177
pkgs.recurseIntoAttrs (
178-
(pkgs.unstable.linuxPackagesFor linux_nitrous).extend (
178+
(pkgs.linuxPackagesFor linux_nitrous).extend (
179179
lpfinal: lpprev: {
180180
ryzen-smu = lpprev.ryzen-smu.overrideAttrs (
181181
oldAttrs:
@@ -202,7 +202,7 @@
202202
in
203203
{
204204
src = newSrc;
205-
stdenv = pkgs.unstable.overrideCC llvm.stdenv (
205+
stdenv = pkgs.overrideCC llvm.stdenv (
206206
llvm.stdenv.cc.override { inherit (llvm) bintools; }
207207
);
208208
nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ llvm.lld ];

0 commit comments

Comments
 (0)