From df275f5b856501e980fe41d9de2d9a8558bdfce3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 25 Aug 2016 02:49:43 +0200 Subject: treewide: fix darwin builds by referring to stdenv's libc --- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/sinit/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index eaf45745f024..efb06ba845e8 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; - buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ]; + buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ]; crossAttrs = { extraCrossConfig = '' diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 0c56a21d6c12..69ffbd61760f 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -10,7 +10,7 @@ let rev = "refs/tags/v${version}"; }; buildInputs = [ - stdenv.glibc.static + stdenv.cc.libc.static ]; in stdenv.mkDerivation { -- cgit 1.4.1