diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:07:56 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:24:03 +0700 |
| commit | 872973d7d1a71570dee1e9c1114e13a072bf3ffc (patch) | |
| tree | 2e9c7e63f8d6407413e21b587ae0c7d91020d71a /pkgs/servers/xmpp | |
| parent | e245ae3c3ac34d24ec6ceb7b86aa74be4fb8e707 (diff) | |
| download | nixpkgs-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar nixpkgs-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.gz nixpkgs-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.bz2 nixpkgs-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.lz nixpkgs-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.xz nixpkgs-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.zst nixpkgs-872973d7d1a71570dee1e9c1114e13a072bf3ffc.zip | |
pkgs/servers: stdenv.lib -> lib
Diffstat (limited to 'pkgs/servers/xmpp')
| -rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/openfire/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1efadd5915e..2fa1c913e27 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl - wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ''; meta = with lib; { diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index ab377e3d53b..a655f1c348f 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "openfire"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { mv $out/conf $out/conf.inst ln -s /var/log/openfire $out/logs ln -s /etc/openfire $out/conf - ''; + ''; meta = { description = "XMPP server in Java"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; # Some security advisories seem to apply, and each next version wants to # write into larger parts of installation directory; installation is just # unpacking, though diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 9b7ed2ac41d..cfa6e226955 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -11,7 +11,7 @@ assert withLibevent -> luaevent != null; assert withDBI -> luadbi != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { |