diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 6581fb8f4452..6982b0fce8c0 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -1,5 +1,4 @@
-{ lib
-, stdenv
+{ stdenv
 , fetchFromGitLab
 , cmake
 , libGLU
@@ -44,7 +43,6 @@
 
 assert ngspiceSupport -> libngspice != null;
 
-with lib;
 let
   versionConfig = versions.${baseName};
 
@@ -54,6 +52,7 @@ let
 
   libraries = callPackages ./libraries.nix versionConfig.libVersion;
 
+  inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
 
@@ -166,7 +165,7 @@ stdenv.mkDerivation rec {
       the libraries are passed via an env var in the wrapper, default.nix
     '';
     homepage = "https://www.kicad-pcb.org/";
-    license = licenses.agpl3;
-    platforms = platforms.all;
+    license = stdenv.lib.licenses.agpl3;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 2758d7765cfb..cfe441409901 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,5 +1,5 @@
-{ lib
-, stdenv
+{ stdenv
+, fetchFromGitLab
 , gnome3
 , wxGTK30
 , wxGTK31
@@ -29,8 +29,6 @@
 }:
 
 assert ngspiceSupport -> libngspice != null;
-
-with lib;
 let
   baseName = if (stable) then "kicad" else "kicad-unstable";
 
@@ -55,6 +53,7 @@ let
   python = python3;
   wxPython = python.pkgs.wxPython_4_0;
 
+  inherit (stdenv.lib) concatStringsSep flatten optionalString optionals;
 in
 stdenv.mkDerivation rec {
 
@@ -109,7 +108,7 @@ stdenv.mkDerivation rec {
   # why does $makeWrapperArgs have to be added explicitly?
   # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set?
   # kicad-ogltest's source seems to indicate that crashing is expected behaviour...
-  installPhase = with lib;
+  installPhase =
     let
       tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ];
       utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ];
@@ -148,7 +147,7 @@ stdenv.mkDerivation rec {
       KiCad is an open source software suite for Electronic Design Automation.
       The Programs handle Schematic Capture, and PCB Layout with Gerber output.
     '';
-    license = licenses.agpl3;
+    license = stdenv.lib.licenses.agpl3;
     # berce seems inactive...
     maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ];
     # kicad is cross platform
diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix
index b424cde195ec..e47b56b5c488 100644
--- a/pkgs/applications/science/electronics/kicad/libraries.nix
+++ b/pkgs/applications/science/electronics/kicad/libraries.nix
@@ -1,5 +1,4 @@
-{ lib
-, stdenv
+{ stdenv
 , cmake
 , gettext
 , fetchFromGitHub
@@ -15,7 +14,6 @@
 #     sha256 = "...";
 #   };
 # };
-with lib;
 let
   mkLib = name:
     stdenv.mkDerivation {
@@ -34,7 +32,7 @@ let
       nativeBuildInputs = [ cmake ];
 
       meta = rec {
-        license = licenses.cc-by-sa-40;
+        license = stdenv.lib.licenses.cc-by-sa-40;
         platforms = stdenv.lib.platforms.all;
         # the 3d models are a ~1 GiB download and occupy ~5 GiB in store.
         # this would exceed the hydra output limit
@@ -69,7 +67,7 @@ in
       );
       nativeBuildInputs = [ cmake gettext ];
       meta = {
-        license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
+        license = stdenv.lib.licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
         platforms = stdenv.lib.platforms.all;
       };
     };