From 16d91ee628d781c721506b19e3e03bed810327e8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 21:45:37 +0700 Subject: pkgs/os-specific: stdenv.lib -> lib --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/zfs') diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 59719922987..85990a6989d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -16,7 +16,7 @@ , enablePython ? true }: -with stdenv.lib; +with lib; let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; @@ -32,7 +32,7 @@ let versionAtLeast kernel.version incompatibleKernelVersion then throw '' Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. - ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} + ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' else stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; -- cgit 1.4.1