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

Commits on Oct 21, 2019

  1. unixODBCDrivers.msodbcsql17: add missing openssl dependency 

    (cherry picked from commit 18ad0a8)
    @aanderse
    aanderse committed Oct 21, 2019
    Copy the full SHA
    51885ec View commit details

Commits on Oct 22, 2019

  1. Merge pull request #71595 from aanderse/msodbc 

    unixODBCDrivers.msodbcsql17: add missing openssl dependency [19.09 backport]
    @globin
    globin authored Oct 22, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    88264b3 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/development/libraries/unixODBCDrivers/default.nix
10 changes: 7 additions & 3 deletions pkgs/development/libraries/unixODBCDrivers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, libuuid, patchelf }:

# I haven't done any parameter tweaking.. So the defaults provided here might be bad

@@ -133,8 +133,7 @@
sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w";
};

nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ unixODBC dpkg kerberos libuuid stdenv.cc.cc ];
nativeBuildInputs = [ dpkg patchelf ];

unpackPhase = "dpkg -x $src ./";
buildPhase = "";
@@ -145,6 +144,11 @@
cp -r opt/microsoft/msodbcsql${versionMajor}/lib64 opt/microsoft/msodbcsql${versionMajor}/share $out/
'';

postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out kerberos libuuid stdenv.cc.cc ]} \
$out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}
'';

passthru = {
fancyName = "ODBC Driver 17 for SQL Server";
driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}";