From 77b6f6734f830058b2375cfc96b5e0fb482cc1c2 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 15 Oct 2024 15:45:42 -0700 Subject: 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 --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'flake.nix') 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; }; -- cgit v1.2.3