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

Commits on Oct 5, 2019

  1. lispPackages.cl-mysql: fix build 

    For [ZHF](#68361)
    @joachifm
    joachifm committed Oct 5, 2019
    Copy the full SHA
    b8193bd View commit details

Commits on Oct 6, 2019

  1. Merge pull request #70493 from joachifm/feat/fix-cl-mysql 

    lispPackages.cl-mysql: fix build
    @joachifm
    joachifm authored Oct 6, 2019
    Copy the full SHA
    7dbf55f View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
9 changes: 8 additions & 1 deletion pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,14 @@ $out/lib/common-lisp/query-fs"
};
};
cffi = addNativeLibs [pkgs.libffi];
cl-mysql = addNativeLibs [pkgs.libmysqlclient];
cl-mysql = x: {
propagatedBuildInputs = [pkgs.libmysqlclient];
overrides = y: (x.overrides y) // {
prePatch = ((x.overrides y).prePatch or "") + ''
sed -i 's,libmysqlclient_r,${pkgs.libmysqlclient}/lib/mysql/libmysqlclient_r,' system.lisp
'';
};
};
cl-ppcre-template = x: {
overrides = y: (x.overrides y) // {
postPatch = ''