diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 16:19:50 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 17:12:36 +0700 |
| commit | 8c5d37129fc5097d9fb52e95fb07de75392d1c3c (patch) | |
| tree | 40cfd341b87811008151e9ecf053cf7449574b98 /pkgs/tools/misc/grub | |
| parent | 94f36839357387fd711d17d762d88c69767f265b (diff) | |
| download | nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.gz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.bz2 nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.lz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.xz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.zst nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.zip | |
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/pvgrub_image/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/trusted.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 207396fb089..d3761f34cda 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -7,7 +7,7 @@ , xenSupport ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a7233d5c4b1..6d747bf8c6e 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # grub-install isn't smart enough. ./symlink.patch ] - ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch) + ++ (lib.optional buggyBiosCDSupport ./buggybios.patch) ++ map fetchurl (import ./grub1.patches.nix) ; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ec5d0ff1295..d6aba812405 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, grub2_xen }: -with stdenv.lib; +with lib; let efiSystemsBuild = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 7a2454cd7b5..b0a8c9e1033 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -3,7 +3,7 @@ , for_HP_laptop ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; |