Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 10 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/applications/networking/sync/casync/default.nix b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix
index 461de492ae2d..0e82aa2dd85d 100644
--- a/nixpkgs/pkgs/applications/networking/sync/casync/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig, python3, sphinx
+{ lib, stdenv, fetchFromGitHub
+, meson, ninja, pkg-config, python3, sphinx
 , acl, curl, fuse, libselinux, udev, xz, zstd
 , fuseSupport ? true
 , selinuxSupport ? true
@@ -19,10 +19,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ acl curl xz zstd ]
-                ++ stdenv.lib.optionals (fuseSupport) [ fuse ]
-                ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ]
-                ++ stdenv.lib.optionals (udevSupport) [ udev ];
-  nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ];
+                ++ lib.optionals (fuseSupport) [ fuse ]
+                ++ lib.optionals (selinuxSupport) [ libselinux ]
+                ++ lib.optionals (udevSupport) [ udev ];
+  nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ];
   checkInputs = [ glibcLocales rsync ];
 
   postPatch = ''
@@ -33,16 +33,16 @@ stdenv.mkDerivation {
   '';
 
   PKG_CONFIG_UDEV_UDEVDIR = "lib/udev";
-  mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ]
-               ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ]
-               ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ];
+  mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ]
+               ++ lib.optionals (!udevSupport) [ "-Dudev=false" ]
+               ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ];
 
   doCheck = true;
   preCheck = ''
     export LC_ALL="en_US.utf-8"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Content-Addressable Data Synchronizer";
     homepage    = "https://github.com/systemd/casync";
     license     = licenses.lgpl21;