public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/servers: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 14:07:56 +07:00
parent e245ae3c3a
commit 872973d7d1
172 changed files with 454 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/sql/mysql/5.7.x.nix
View File

@@ -16,7 +16,7 @@ self = stdenv.mkDerivation rec {
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
};
preConfigure = stdenv.lib.optional stdenv.isDarwin ''
preConfigure = lib.optional stdenv.isDarwin ''
ln -s /bin/ps $TMPDIR/ps
export PATH=$PATH:$TMPDIR
'';
@@ -24,7 +24,7 @@ self = stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ];
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
outputs = [ "out" "static" ];
@@ -58,7 +58,7 @@ self = stdenv.mkDerivation rec {
];
CXXFLAGS = "-fpermissive -std=c++11";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
prePatch = ''
sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in

4
pkgs/servers/sql/mysql/jdbc/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, ant, unzip}:
{lib, stdenv, fetchurl, ant, unzip}:
stdenv.mkDerivation rec {
name = "mysql-connector-java-5.1.46";
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip ant ];
meta = {
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}