From 5430ebb2c67e2ae16cb0e08288f6d3dd3ee2d66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 14 Mar 2021 02:13:19 +0100 Subject: [PATCH] top-level: add uutils-coreutils stdenv --- pkgs/top-level/all-packages.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4d72af0de67..c7aa914d2422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -91,6 +91,36 @@ with pkgs; gccStdenvNoLibs = mkStdenvNoLibs gccStdenv; clangStdenvNoLibs = mkStdenvNoLibs clangStdenv; + stdenvUutilsCoreutils = + let + uutils-coreutils = pkgs.uutils-coreutils; + bintools = wrapBintoolsWith { + bintools = stdenv.cc.bintools.bintools; + coreutils = uutils-coreutils; + }; + in + stdenv.override { + cc = stdenv.cc.override { + coreutils = uutils-coreutils; + inherit bintools; + }; + + initialPath = (lib.remove coreutils stdenv.initialPath) ++ [ uutils-coreutils ]; + allowedRequisites = lib.mapNullable ( + rs: + (lib.remove [ + bintools + expand-response-params + coreutils + ] rs) + ++ [ + bintools + expand-response-params + uutils-coreutils + ] + ) (stdenv.allowedRequisites or null); + }; + # For convenience, allow callers to get the path to Nixpkgs. path = ../..;