diff options
| author | Robin Gloster <mail@glob.in> | 2017-12-27 17:00:39 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | 572b2bda4e0a2245f465738cc919197ae0af06a4 (patch) | |
| tree | 25e272248d6d0c114354a946430499b789b7be31 /pkgs/development/lisp-modules | |
| parent | 6903ea60502865fe4397d8aaacc38ff674acaeb9 (diff) | |
| download | nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.gz nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.bz2 nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.lz nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.xz nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.zst nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.zip | |
treewide: generalise for both mysql & mariadb
Diffstat (limited to 'pkgs/development/lisp-modules')
| -rw-r--r-- | pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/lisp-modules/shell.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 6ca3a608934b..f2efa1ab1b4b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -56,8 +56,8 @@ in propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mariadb" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mariadb" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql" ''; }; }; diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index b29ba53159e6..d3cb7b36aeeb 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -5,11 +5,11 @@ self = rec { env = buildEnv { name = name; paths = buildInputs; }; buildInputs = [ gcc stdenv - openssl fuse libuv mariadb libfixposix libev sqlite + openssl fuse libuv mysql.connector-c libfixposix libev sqlite freetds lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self |