Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 7 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/development/libraries/gamin/default.nix b/nixpkgs/pkgs/development/libraries/gamin/default.nix
index 89096c887450..56de42d9dc5b 100644
--- a/nixpkgs/pkgs/development/libraries/gamin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gamin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }:
 
 let
   cross = stdenv.hostPlatform != stdenv.buildPlatform;
@@ -10,7 +10,7 @@ in stdenv.mkDerivation (rec {
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
   buildInputs = [ glib ];
 
@@ -24,15 +24,15 @@ in stdenv.mkDerivation (rec {
 
   patches = [ ./deadlock.patch ]
     ++ map fetchurl (import ./debian-patches.nix)
-    ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+    ++ lib.optional stdenv.cc.isClang ./returnval.patch
+    ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
       name = "fix-pthread-mutex.patch";
       url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
       sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
-    }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ;
+    }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ;
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://people.gnome.org/~veillard/gamin/";
     description = "A file and directory monitoring system";
     maintainers = with maintainers; [ lovek323 ];
@@ -41,7 +41,7 @@ in stdenv.mkDerivation (rec {
   };
 }
 
-// stdenv.lib.optionalAttrs stdenv.isDarwin {
+// lib.optionalAttrs stdenv.isDarwin {
   preBuild =  ''
     sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
   '';