From 61202561d92cf1cd74532fcbd8b9d6662c5bc57b Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:28:35 -0700 Subject: [PATCH] freebsd.{libc,compat,include}: use no-libs stdenv Previously, an attribute named isStatic did this, but this was lost in a refactor. Revive it and rename it to noLibc to be more clear about its intended use. --- pkgs/os-specific/bsd/freebsd/pkgs/csu.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix | 9 ++++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix index 0f74d78b1d13..020a08c1d01e 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix @@ -12,7 +12,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; path = "lib/csu"; extraPaths = [ "lib/Makefile.inc" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix index 70734226a54f..a7ceb0cdf384 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix @@ -7,7 +7,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; path = "include"; extraPaths = [ diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix index 8f2cc976463e..a991e6926582 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix @@ -21,7 +21,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; pname = "libc"; path = "lib/libc"; extraPaths = diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index 9659f92d17d7..c6659ac0d91c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,6 +2,7 @@ lib, stdenv, stdenvNoCC, + stdenvNoLibs, versionData, writeText, patches, @@ -21,7 +22,13 @@ lib.makeOverridable ( attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + stdenv' = + if attrs.noCC or false then + stdenvNoCC + else if attrs.noLibc or false then + stdenvNoLibs + else + stdenv; in stdenv'.mkDerivation ( rec {