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: 5784f9beb5bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e48b747d2f99
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 20, 2019

  1. luaPackages.luadbi-mysql: Fix linking issue

    @Shados
    Shados committed Jun 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Doctor-wu Doctor Wu
    GPG key ID: 7D1412F015912FB2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    460217d View commit details

  2. Merge #63547: luaPackages.luadbi-mysql: Fix linking issue 

    Fixes the prosody test, and it seems very unlikely to break anything.
    @vcunat
    vcunat committed Jun 20, 2019
    Copy the full SHA
    e48b747 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/lua-modules/overrides.nix
3 changes: 2 additions & 1 deletion pkgs/development/lua-modules/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -137,8 +137,9 @@ with super;

luadbi-mysql = super.luadbi-mysql.override({
extraVariables = ''
-- Can't just be /include, unfortunately
-- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql';
'';
buildInputs = [
pkgs.mysql.client