diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix
index f68b884..855f90c 100644
--- a/pkgs/applications/audio/mopidy/subidy.nix
+++ b/pkgs/applications/audio/mopidy/subidy.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , python3Packages
 
@@ -20,7 +21,7 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Prior99/mopidy-subidy";
     description = "Mopidy extension for playing music from Subsonic servers";
     license = licenses.bsd3;
diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix
index 541d668..3c738d1 100644
--- a/pkgs/applications/audio/psst/default.nix
+++ b/pkgs/applications/audio/psst/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , rustPlatform
 
@@ -14,7 +15,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
 in
 
 assert withGui -> gtk3.meta.available;
@@ -63,7 +64,7 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast and multi-platform Spotify client with native GUI ";
     homepage = "https://github.com/jpochyla/psst";
     license = licenses.mit;
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index c171008..375a5df 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , buildGoModule
 
@@ -18,7 +19,7 @@ let
     , ...
     }@args:
 
-    buildGoModule (stdenv.lib.recursiveUpdate args rec {
+    buildGoModule (lib.recursiveUpdate args rec {
       inherit pname;
       version = "1.5.6";
 
@@ -53,7 +54,7 @@ let
           ''
         ];
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Integrate ProtonMail paid account with any program that supports IMAP and SMTP";
         homepage = "https://protonmail.com";
         license = licenses.gpl3;
diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix
index 9d14d37..33101f1 100644
--- a/pkgs/applications/window-managers/cardboard/default.nix
+++ b/pkgs/applications/window-managers/cardboard/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitLab
 , fetchzip
 
@@ -62,10 +63,10 @@ stdenv.mkDerivation rec {
 
   passthru.providedSessions = [ "cardboard" ];
 
-  meta = {
+  meta = with lib; {
     description = "Scrollable tiling Wayland compositor designed with laptops in mind";
     homepage = "https://gitlab.com/cardboardwm/cardboard";
-    license = stdenv.lib.licenses.gpl3;
+    license = licenses.gpl3;
     platforms = wlroots.meta.platforms;
   };
 }
diff --git a/pkgs/development/go-modules/qt/default.nix b/pkgs/development/go-modules/qt/default.nix
index a4c4dd9..b8bd9c9 100644
--- a/pkgs/development/go-modules/qt/default.nix
+++ b/pkgs/development/go-modules/qt/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , buildGoModule
 , makeWrapper
@@ -59,7 +60,7 @@ buildGoModule rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/therecipe/qt";
     description = "Qt bindings for Go";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libhl/default.nix b/pkgs/development/libraries/libhl/default.nix
index c2ec2e2..b82f341 100644
--- a/pkgs/development/libraries/libhl/default.nix
+++ b/pkgs/development/libraries/libhl/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 
 , coreutils
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/xant/libhl";
     description = "Simple and fast C library implementing a thread-safe API to manage hash-tables, linked lists, lock-free ring buffers and queues ";
     license = licenses.lgpl3;
diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix
index 8624755..eca2936 100644
--- a/pkgs/development/python-modules/py-sonic/default.nix
+++ b/pkgs/development/python-modules/py-sonic/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , buildPythonPackage
 , fetchPypi
 }:
@@ -14,9 +15,9 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://stuffivelearned.org/doku.php?id=programming:python:py-sonic";
-    license = stdenv.lib.licenses.gpl3;
+    license = licenses.gpl3;
     description = "A python wrapper library for the Subsonic REST API";
   };
 }
diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/os-specific/linux/pam_gnupg/default.nix
index 80aea76..aaf6c94 100644
--- a/pkgs/os-specific/linux/pam_gnupg/default.nix
+++ b/pkgs/os-specific/linux/pam_gnupg/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 
 , autoreconfHook
@@ -25,10 +26,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-moduledir=\${out}/lib/security" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cruegge/pam-gnupg";
     description = "Unlock GnuPG keys on login";
     license = licenses.gpl3;
-    inherit (pam.meta) platforms;
+    platforms = pam.meta.platforms;
   };
 }
diff --git a/pkgs/shells/zsh/zsh-z/default.nix b/pkgs/shells/zsh/zsh-z/default.nix
index c75cd70..47ee59e 100644
--- a/pkgs/shells/zsh/zsh-z/default.nix
+++ b/pkgs/shells/zsh/zsh-z/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , installShellFiles
 
@@ -25,10 +26,10 @@ stdenv.mkDerivation {
     installShellCompletion --zsh _zshz
   '';
 
-  meta = {
+  meta = with lib; {
     description = ''Jump quickly to directories that you have visited "frecently." A native ZSH port of z.sh.'';
     homepage = "https://github.com/agkozak/zsh-z";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     platforms = zsh.meta.platforms;
   };
 }
diff --git a/pkgs/tools/misc/amdgpu-fan/default.nix b/pkgs/tools/misc/amdgpu-fan/default.nix
index 37a7742..2a5f9f1 100644
--- a/pkgs/tools/misc/amdgpu-fan/default.nix
+++ b/pkgs/tools/misc/amdgpu-fan/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 
 , python3Packages
@@ -20,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     pyyaml
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fan controller for AMD graphics cards running the amdgpu driver on Linux";
     homepage = "https://github.com/chestm007/amdgpu-fan";
     license = licenses.gpl2;
diff --git a/pkgs/tools/misc/radeon-profile-daemon/default.nix b/pkgs/tools/misc/radeon-profile-daemon/default.nix
index 80a79c8..5abb6c6 100644
--- a/pkgs/tools/misc/radeon-profile-daemon/default.nix
+++ b/pkgs/tools/misc/radeon-profile-daemon/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 
 , qtbase
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
       --replace "/usr/" "$out/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "System daemon for reading current clocks of AMD Radeon cards";
     homepage = "https://github.com/marazmista/radeon-profile-daemon";
     license = licenses.gpl2Plus;
diff --git a/pkgs/tools/misc/samrewritten/default.nix b/pkgs/tools/misc/samrewritten/default.nix
index 8cdcbea..ef45e80 100644
--- a/pkgs/tools/misc/samrewritten/default.nix
+++ b/pkgs/tools/misc/samrewritten/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 , makeWrapper
 
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
       --replace /usr/bin/samrewritten $out/bin/samrewritten
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Steam Achievement Manager For Linux";
     homepage = "https://github.com/PaulCombal/SamRewritten";
     license = licenses.gpl3;
diff --git a/pkgs/tools/misc/spotify-ripper/default.nix b/pkgs/tools/misc/spotify-ripper/default.nix
index a31d620..d8993d9 100644
--- a/pkgs/tools/misc/spotify-ripper/default.nix
+++ b/pkgs/tools/misc/spotify-ripper/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchFromGitHub
 
 , python2Packages
@@ -48,7 +49,7 @@ python2Packages.buildPythonApplication rec {
   # Remove impure executables.
   patches = [ ./fix-setup.patch ];
 
-  meta = {
+  meta = with lib; {
     description = "Rip Spotify URIs to audio files, including ID3 tags and cover art";
     longDescription = ''
       Spotify-ripper is a small ripper script for Spotify that rips Spotify URIs
@@ -58,6 +59,6 @@ python2Packages.buildPythonApplication rec {
     '';
     homepage = "https://github.com/hbashton/spotify-ripper";
     # spotify-ripper itself is MIT, but the upstream libspotify is unfree.
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
   };
 }