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

Commits on Nov 26, 2020

  1. postfix: fix "cant find <mysql.h>" 

    (cherry picked from commit 0e87647)
    @ymarkus
    ymarkus committed Nov 26, 2020
    Copy the full SHA
    01eb683 View commit details

  2. Merge pull request #105034 from ymarkus/backport-fix-postfixMySQL 

    [20.09] postfix: fix "cant find <mysql.h>" when building with "withMySQL = true"
    @mweinelt
    mweinelt authored Nov 26, 2020
    Copy the full SHA
    7f144df View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/servers/mail/postfix/default.nix
2 changes: 1 addition & 1 deletion pkgs/servers/mail/postfix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ let
"-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
"-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
] ++ lib.optional withPgSQL "-DHAS_PGSQL"
++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient.dev}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
++ lib.optional withSQLite "-DHAS_SQLITE"
++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
auxlibs = lib.concatStringsSep " " ([