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

mysql: Use libs in place of the binary mysql

Browse Source
This commit is contained in:
William A. Kennington III
2015-04-01 16:39:50 -07:00
parent bc7b39784a
commit a604b42480
28 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/computing/slurm/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0xx1q9ximsyyipl0xbj8r7ajsz4xrxik8xmhcb1z9nv0aza1rff2";
};
buildInputs = [ python munge perl pam openssl mysql ];
buildInputs = [ python munge perl pam openssl mysql.lib ];
configureFlags = ''
--with-munge=${munge}

6
pkgs/servers/games/ghost-one/default.nix
View File

@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2";
};
buildInputs = [ unzip gmp zlib bzip2 boost mysql ];
buildInputs = [ unzip gmp zlib bzip2 boost mysql.lib ];
patchPhase = ''
substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql}/lib/mysql"
substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql.lib}/lib/mysql"
'';
buildPhase = ''
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = [ maintainers.phreedom ];
};
}
}

2
pkgs/servers/http/lighttpd/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5_1
++ stdenv.lib.optional enableMysql mysql;
++ stdenv.lib.optional enableMysql mysql.lib;
configureFlags = [ "--with-openssl" ]
++ stdenv.lib.optional enableMagnet "--with-lua"

6
pkgs/servers/restund/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, zlib, openssl, libre, librem, mysql}:
{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }:
stdenv.mkDerivation rec {
version = "0.4.2";
name = "restund-${version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "http://www.creytiv.com/pub/restund-${version}.tar.gz";
sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2";
};
buildInputs = [zlib openssl libre librem mysql];
buildInputs = [ zlib openssl libre librem mysql.lib ];
makeFlags = [
"LIBRE_MK=${libre}/share/re/re.mk"
"LIBRE_INC=${libre}/include/re"
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
;
NIX_LDFLAGS='' -L${mysql}/lib/mysql '';
NIX_LDFLAGS='' -L${mysql.lib}/lib/mysql '';
meta = {
homepage = "http://www.creytiv.com/restund.html";
platforms = with stdenv.lib.platforms; linux;