pkgs/servers: stdenv.lib -> lib

5 files changed, 15 insertions, 15 deletions

diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 673167030dc17..86230e11cb98d 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -1,6 +1,6 @@
 { elk6Version
 , enableUnfree ? true
-, stdenv
+, lib, stdenv
 , fetchurl
 , makeWrapper
 , jre_headless
@@ -9,7 +9,7 @@
 , zlib
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation (rec {
   version = elk6Version;
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index c3d50f8fbddd0..6a51e5ea62f82 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -1,6 +1,6 @@
 { elk7Version
 , enableUnfree ? true
-, stdenv
+, lib, stdenv
 , fetchurl
 , makeWrapper
 , jre_headless
@@ -9,7 +9,7 @@
 , zlib
 }:
 
-with stdenv.lib;
+with lib;
 let
   info = splitString "-" stdenv.hostPlatform.system;
   arch = elemAt info 0;
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 8f7e63665b860..d05c2e527e2d1 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "191saqanv8k6ijl96mw4jdhh9pkpdn651f1bg4kfb34p7vy8ld9k";
   };
 
-  buildInputs = with stdenv.lib;
+  buildInputs = with lib;
      [ pkgconfig mecab kytea libedit ]
     ++ optional lz4Support lz4
     ++ optional zlibSupport zlib
     ++ optionals suggestSupport [ zeromq libevent msgpack ];
 
-  configureFlags = with stdenv.lib;
+  configureFlags = with lib;
        optional zlibSupport "--with-zlib"
     ++ optional lz4Support  "--with-lz4";
 
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index 569da6b5b971b..6ee90aba2991c 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0axjygk8a7cykpa5skk4a6mkm8rndkr76l10h3z3gjdc88b17qcz";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ];
 
   meta = with lib; {
     description = "Ultra relevant and instant full-text search API";
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 47547f07fb49a..a44f96db7026a 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, expat, libmysqlclient,
+{ lib, stdenv, fetchurl, pkg-config, expat, libmysqlclient,
   enableXmlpipe2 ? false,
   enableMysql ? true
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--program-prefix=sphinxsearch-"
     "--enable-id64"
-  ] ++ stdenv.lib.optionals (!enableMysql) [
+  ] ++ lib.optionals (!enableMysql) [
     "--without-mysql"
   ];
 
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs = stdenv.lib.optionals enableMysql [
+  buildInputs = lib.optionals enableMysql [
     libmysqlclient
-  ] ++ stdenv.lib.optionals enableXmlpipe2 [
+  ] ++ lib.optionals enableXmlpipe2 [
     expat
   ];
 
-  CXXFLAGS = with stdenv.lib; concatStringsSep " " (optionals stdenv.isDarwin [
+  CXXFLAGS = with lib; concatStringsSep " " (optionals stdenv.isDarwin [
     # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578
     # workaround for "error: invalid suffix on literal
     "-Wno-reserved-user-defined-literal"
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open source full text search server";
     homepage    = "http://sphinxsearch.com";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ];
+    license     = lib.licenses.gpl2;
+    platforms   = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ederoyd46 valodim ];
   };
 }