From 90f73381120f7ae9e0d5f0f6dc16cb141c658494 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 24 Jan 2021 01:40:18 +0100 Subject: treewide: stdenv.lib -> lib --- pkgs/build-support/substitute-files/substitute-all-files.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/build-support/substitute-files') diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index 66feb695c418b..682e976dcfe52 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -1,10 +1,10 @@ -{ stdenv }: +{ lib, stdenv }: args: stdenv.mkDerivation ({ name = if args ? name then args.name else baseNameOf (toString args.src); - builder = with stdenv.lib; builtins.toFile "builder.sh" '' + builder = builtins.toFile "builder.sh" '' source $stdenv/setup set -o pipefail @@ -13,7 +13,7 @@ stdenv.mkDerivation ({ args= pushd "$src" - echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do + echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do mkdir -p "$out/$(dirname "$line")" substituteAll "$line" "$out/$line" done -- cgit 1.4.1