diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-04-01 16:39:50 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-04-01 16:46:53 -0700 |
| commit | a604b4248054b31bbdfd1c96fdf591793859abc5 (patch) | |
| tree | a0ecfcb0fc82ca7a1fbe2776764ccb57fda40e87 /pkgs/servers/restund | |
| parent | bc7b39784ac6779820ac2bfefc1f7a94ba3ab310 (diff) | |
| download | nixlib-a604b4248054b31bbdfd1c96fdf591793859abc5.tar nixlib-a604b4248054b31bbdfd1c96fdf591793859abc5.tar.gz nixlib-a604b4248054b31bbdfd1c96fdf591793859abc5.tar.bz2 nixlib-a604b4248054b31bbdfd1c96fdf591793859abc5.tar.lz nixlib-a604b4248054b31bbdfd1c96fdf591793859abc5.tar.xz nixlib-a604b4248054b31bbdfd1c96fdf591793859abc5.tar.zst nixlib-a604b4248054b31bbdfd1c96fdf591793859abc5.zip | |
mysql: Use libs in place of the binary mysql
Diffstat (limited to 'pkgs/servers/restund')
| -rw-r--r-- | pkgs/servers/restund/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 65e957852fbf..705a4ba43e7f 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -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; |