From f2c799c9dfff8d8386ec4503a9297052fb01c2d2 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 2 Sep 2021 23:19:25 -0700 Subject: [PATCH] pkgsStatic: make pkgsMusl a no-op When pkgsStatic is already musl, we can let pkgsMusl simply be a no-op. As the interaction of pkgsStatic and pkgsMusl machinery is currently broken, this fixes pkgsStatic.pkgsMusl.stdenv. --- pkgs/top-level/stage.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 048ab88854ed..8aa46192660f 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -290,9 +290,15 @@ let # Currently uses Musl on Linux (couldn’t get static glibc to work). pkgsStatic = nixpkgsFun { overlays = [ - (self': super': { - pkgsStatic = super'; - }) + ( + self': super': + { + pkgsStatic = super'; + } + // lib.optionalAttrs super'.stdenv.hostPlatform.isMusl { + pkgsMusl = super'; + } + ) ] ++ overlays; crossSystem = {