From 8c5d37129fc5097d9fb52e95fb07de75392d1c3c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 16:19:50 +0700 Subject: pkgs/tools: stdenv.lib -> lib --- pkgs/tools/security/opensc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/security/opensc') diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index f623e3a2f6f..8201b809d15 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon + ++ lib.optional stdenv.isDarwin Carbon ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { if withApplePCSC then "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" else - "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" }" - (stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) + (lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc") ]; - PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC + PCSC_CFLAGS = lib.optionalString withApplePCSC "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; installFlags = [ -- cgit 1.4.1