1 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
index d3e8b417017d..88d47b58932a 100644
--- a/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
-{ stdenv
-, gettext, pkgconfig
+{ lib, stdenv
+, gettext, pkg-config
 , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
 
 # List of { src name backend } attibute sets - see installFirmware below:
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     gettext
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
@@ -39,19 +39,19 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   configureFlags = []
-    ++ stdenv.lib.optional (avahi != null)   "--enable-avahi"
-    ++ stdenv.lib.optional (libusb1 != null) "--with-usb"
+    ++ lib.optional (avahi != null)   "--enable-avahi"
+    ++ lib.optional (libusb1 != null) "--with-usb"
   ;
 
   postInstall = let
 
     compatFirmware = extraFirmware
-      ++ stdenv.lib.optional (gt68xxFirmware != null) {
+      ++ lib.optional (gt68xxFirmware != null) {
         src = gt68xxFirmware.fw;
         inherit (gt68xxFirmware) name;
         backend = "gt68xx";
       }
-      ++ stdenv.lib.optional (snapscanFirmware != null) {
+      ++ lib.optional (snapscanFirmware != null) {
         src = snapscanFirmware;
         name = "your-firmwarefile.bin";
         backend = "snapscan";
@@ -75,9 +75,9 @@ stdenv.mkDerivation {
 
     # net.conf conflicts with the file generated by the nixos module
     rm -f $out/etc/sane.d/net.conf
-  '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
+  '' + lib.concatStrings (builtins.map installFirmware compatFirmware);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SANE (Scanner Access Now Easy) backends";
     longDescription = ''
       Collection of open-source SANE backends (device drivers).