git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Use configuration-nix to include freetds dependency of the odbc package (#1000)
8455f75Michael Peyton Jones
lib/system-nixpkgs-map.nix+2−3
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -73,10 +73,9 @@ with pkgs;
73 boost_wave = [ boost ];
73 boost_wave = [ boost ];
74 boost_wserialization = [ boost ];
74 boost_wserialization = [ boost ];
75 tensorflow = [ libtensorflow ];
75 tensorflow = [ libtensorflow ];
76− # odbc package requires both freetds (https://github.com/fpco/odbc/commit/9457377089dbe84d8c329560fa1bc1a2797c821d)
77− # and unixODBC packages to be installed in order to successfully
76+ # odbc package requires unixODBC packages to be installed in order to successfully
78 # compile C sources (https://github.com/fpco/odbc/blob/master/cbits/odbc.c)
77 # compile C sources (https://github.com/fpco/odbc/blob/master/cbits/odbc.c)
79− odbc = [ freetds unixODBC ];
78+ odbc = [ unixODBC ];
80 opencv = [ opencv3 ];
79 opencv = [ opencv3 ];
81 icuuc = [ icu ];
80 icuuc = [ icu ];
82 icui18n = [ icu ];
81 icui18n = [ icu ];
modules/configuration-nix.nix+5−1
@@ -7,7 +7,7 @@
7 # terminfo doesn't list libtinfo in its cabal file. We could ignore
7 # terminfo doesn't list libtinfo in its cabal file. We could ignore
8 # this if we used the terminfo shipped with GHC, but this package is
8 # this if we used the terminfo shipped with GHC, but this package is
9 # reinstallable so we'd rather have it defined in the plan.
9 # reinstallable so we'd rather have it defined in the plan.
10− packages.terminfo.components.library.libs = [pkgs.ncurses];
10+ packages.terminfo.components.library.libs = [ pkgs.ncurses ];
11
11
12 # The `extra-libraries` field in `X11.cabal` does not include Xss and Xinerama
12 # The `extra-libraries` field in `X11.cabal` does not include Xss and Xinerama
13 # see https://github.com/input-output-hk/haskell.nix/pull/988
13 # see https://github.com/input-output-hk/haskell.nix/pull/988
@@ -16,6 +16,10 @@
16 pkgs.xorg.libXinerama
16 pkgs.xorg.libXinerama
17 ];
17 ];
18
18
19+ # odbc needs this package to provide odbcss.h on Linux and macOS, see
20+ # https://github.com/fpco/odbc#common-issues
21+ packages.odbc.components.library.libs = [ pkgs.freetds ];
22+
19 # These packages have `license: LGPL` in their .cabal file, but
23 # These packages have `license: LGPL` in their .cabal file, but
20 # do not specify the version. Setting the version here on
24 # do not specify the version. Setting the version here on
21 # examination of the license files included in the packages.
25 # examination of the license files included in the packages.