diff --git a/lib/pkgconf-nixpkgs-map.nix b/lib/pkgconf-nixpkgs-map.nix
index ae94f99491..f662dafccb 100644
--- a/lib/pkgconf-nixpkgs-map.nix
+++ b/lib/pkgconf-nixpkgs-map.nix
@@ -10,10 +10,10 @@ pkgs:
     lookupAttrsIn = x: __mapAttrs (_pname: names:
       # The first entry is should be used for the version by allPkgConfigWrapper
       # so we need it to be present.
-      with pkgs.lib; optionals (__length names != 0 && x ? ${__head names})
+      with lib; optionals (__length names != 0 && x ? ${__head names})
         (concatMap
           (name: optionals (x ? ${name})
-            (let p = __tryEval (x.${name}); in optionals p.success p.value))
+            (let p = __tryEval (x.${name}); in optional p.success p.value))
           names));
   in lookupAttrsIn pkgs ({
     # Based on https://github.com/NixOS/cabal2nix/blob/11c68fdc79461fb74fa1dfe2217c3709168ad752/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs#L23