aboutsummaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorJade Lovelace <lix@jade.fyi>2024-10-15 15:45:42 -0700
committerJade Lovelace <lix@jade.fyi>2024-10-18 15:40:22 -0700
commit77b6f6734f830058b2375cfc96b5e0fb482cc1c2 (patch)
treee9d701278360e392cc75b10233608b7aa9bfc896 /flake.nix
parente2d00ac3a805bef7af8e7ec765af0d8ba34f4b3c (diff)
packaging: remove workaround for clang stdenv asserts
This workaround was for the stdenv not being set when callPackage'ing package.nix for some of the stranger CI outputs. Change-Id: I2acdd6efa721b90dd3cb04358544d25d591ff084
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/flake.nix b/flake.nix
index f77f848ca..9fe752dc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -269,6 +269,8 @@
nix = pkgs.callPackage ./package.nix {
inherit versionSuffix officialRelease buildUnreleasedNotes;
inherit (pkgs) build-release-notes;
+ # Required since we don't support gcc stdenv
+ stdenv = pkgs.clangStdenv;
internalApiDocs = true;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
};
@@ -326,6 +328,8 @@
inherit (nixpkgs) pkgs;
in
pkgs.callPackage ./package.nix {
+ # Required since we don't support gcc stdenv
+ stdenv = pkgs.clangStdenv;
versionSuffix = "";
lintInsteadOfBuild = true;
};