From 02ee14b9d54d31351689084c47f9a048a41f27b4 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 12:50:30 +0700 Subject: treewide: stdenvNoCC.lib -> lib --- pkgs/build-support/fetchsvn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/build-support/fetchsvn') diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 06f0ea0a3d1..82dececc124 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, buildPackages +{ lib, stdenvNoCC, buildPackages , subversion, glibcLocales, sshSupport ? true, openssh ? null }: @@ -10,7 +10,7 @@ assert sshSupport -> openssh != null; let - repoName = with stdenvNoCC.lib; + repoName = with lib; let fst = head; snd = l: head (tail l); @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; nativeBuildInputs = [ subversion glibcLocales ] - ++ stdenvNoCC.lib.optional sshSupport openssh; + ++ lib.optional sshSupport openssh; SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; @@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation { inherit url rev ignoreExternals ignoreKeywords; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; } -- cgit 1.4.1