pkgs/shells: stdenv.lib -> lib
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
, withDocs ? false, texinfo ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
assert interactive -> readline70 != null;
|
||||
assert withDocs -> texinfo != null;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
, texinfo ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
assert interactive -> readline80 != null;
|
||||
assert withDocs -> texinfo != null;
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
# - ignore test_screen because it assumes vt terminals exist
|
||||
checkPhase = ''
|
||||
pytest . \
|
||||
${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \
|
||||
${lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \
|
||||
--ignore=test/t/test_chsh.py \
|
||||
--ignore=test/t/test_ether_wake.py \
|
||||
--ignore=test/t/test_ifdown.py \
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
--ignore=test/t/test_screen.py
|
||||
'';
|
||||
|
||||
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
sed -i -e 's/readlink -f/readlink/g' bash_completion completions/*
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user