Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4a03ddd08d47
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 724dbda1e0ca
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Oct 8, 2019

  1. multiple packages: fix reference to mysql headers 

    These broke in ce2bb4d

cc @ttuegel
    @lheckemann
    lheckemann committed Oct 8, 2019
    Copy the full SHA
    724dbda View commit details
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libdbi-drivers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
"--with-dbi-libdir=${libdbi}/lib"
] ++ optionals (mysql != null) [
"--with-mysql"
"--with-mysql-incdir=${mysql.connector-c}/include/mysql"
"--with-mysql-incdir=${getDev mysql.connector-c}/include/mysql"
"--with-mysql-libdir=${mysql.connector-c}/lib/mysql"
] ++ optionals (sqlite != null) [
"--with-sqlite3"
2 changes: 1 addition & 1 deletion pkgs/development/libraries/opendbx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};

preConfigure = ''
export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
export CPPFLAGS="-I${stdenv.lib.getDev mysql.connector-c}/include/mysql"
export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
'';
2 changes: 1 addition & 1 deletion pkgs/development/lua-modules/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ with super;
luadbi-mysql = super.luadbi-mysql.override({
extraVariables = ''
-- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
MYSQL_INCDIR='${pkgs.lib.getDev pkgs.mysql.connector-c}/include/mysql';
MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql';
'';
buildInputs = [
2 changes: 1 addition & 1 deletion pkgs/development/pure-modules/glpk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

preConfigure = ''
substituteInPlace configure \
--replace /usr/include/mysql ${mysql.connector-c}/include/mysql
--replace /usr/include/mysql ${lib.getDev mysql.connector-c}/include/mysql
'';
configureFlags = [ "--enable-dl"
"--enable-odbc"
5 changes: 3 additions & 2 deletions pkgs/tools/networking/mailutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
, python, gss, mysql, system-sendmail }:

let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
name = "${project}-${version}";
project = "mailutils";
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
sed -i -e '/chown root:mail/d' \
-e 's/chmod [24]755/chmod 0755/' \
*/Makefile{.in,.am}
sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac
sed -i 's:/usr/lib/mysql:${getDev mysql.connector-c}/lib/mysql:' configure.ac
sed -i 's/0\.18/0.19/' configure.ac
sed -i -e 's:mysql/mysql.h:mysql.h:' \
-e 's:mysql/errmsg.h:errmsg.h:' \
@@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
(fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
];

NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql";
NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${getDev mysql.connector-c}/include/mysql";

checkInputs = [ dejagnu ];
doCheck = false; # fails 1 out of a bunch of tests, looks like a bug