diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-05-17 18:33:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-17 18:33:31 +0100 |
commit | 4c74fccb3675c0b32fe72305d14a3c907bb2d4bc (patch) | |
tree | 001571283ae26374e647e8f1f9d0ed62e5b96b9a | |
parent | 838bfaa8edf2c1224715eda00f143a5dc363e65a (diff) | |
parent | 639f7952be31f89d22512bf661d03a4fe2b075a2 (diff) | |
download | nixlib-4c74fccb3675c0b32fe72305d14a3c907bb2d4bc.tar nixlib-4c74fccb3675c0b32fe72305d14a3c907bb2d4bc.tar.gz nixlib-4c74fccb3675c0b32fe72305d14a3c907bb2d4bc.tar.bz2 nixlib-4c74fccb3675c0b32fe72305d14a3c907bb2d4bc.tar.lz nixlib-4c74fccb3675c0b32fe72305d14a3c907bb2d4bc.tar.xz nixlib-4c74fccb3675c0b32fe72305d14a3c907bb2d4bc.tar.zst nixlib-4c74fccb3675c0b32fe72305d14a3c907bb2d4bc.zip |
Merge pull request #40688 from flokli/oracle-fixes
pythonPackages.cx_oracle: fix dlopen, patchelf and fix library path for oracle-instantclient binaries
3 files changed, 42 insertions, 8 deletions
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 1c629c137796..6ed3e584fa34 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,6 +1,4 @@ -{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio -, odbcSupport ? false, unixODBC -}: +{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }: assert odbcSupport -> unixODBC != null; @@ -34,9 +32,11 @@ in stdenv.mkDerivation rec { srcSqlplus = (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552"); srcOdbc = optionalString odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1"); - buildInputs = [ glibc patchelf rpmextract ] ++ + buildInputs = [ glibc ] ++ optional odbcSupport unixODBC; + nativeBuildInputs = [ rpmextract patchelf makeWrapper ]; + buildCommand = '' mkdir -p "${name}" cd "${name}" @@ -66,10 +66,11 @@ in stdenv.mkDerivation rec { $lib done - for exe in $out/bin/sqlplus; do + for exe in $out/bin/{adrci,genezi,sqlplus}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ $exe + wrapProgram $exe --prefix LD_LIBRARY_PATH ":" $out/lib done ''; diff --git a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch new file mode 100644 index 000000000000..a2de7b248531 --- /dev/null +++ b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch @@ -0,0 +1,27 @@ +From 355b9d812efdfbd041e14b365258b69c81689981 Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Thu, 17 May 2018 18:37:40 +0200 +Subject: [PATCH] odpi/src/dpiOci.c: nixify libclntsh.so dlopen + +--- + odpi/src/dpiOci.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/odpi/src/dpiOci.c b/odpi/src/dpiOci.c +index 76b9867..22c2987 100644 +--- a/odpi/src/dpiOci.c ++++ b/odpi/src/dpiOci.c +@@ -1575,6 +1575,10 @@ static int dpiOci__loadLib(dpiError *error) + } + } + } ++ if(!dpiOciLibHandle) { ++ dpiOciLibHandle = dlopen("@libclntsh@", RTLD_LAZY); ++ } ++ + #endif + + if (!dpiOciLibHandle) { +-- +2.16.3 + diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index f2e10caad726..c9925fad88d4 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "6.2.1"; + version = "6.3.1"; buildInputs = [ oracle-instantclient @@ -10,10 +10,16 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01970bc843b3c699a7fd98af19e0401fe69abfbd2acdf464e0bf2ae06ea372b9"; + sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7"; }; - # Check need an Oracle database to run + patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ]; + + postPatch = '' + substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ ${oracle-instantclient}/lib/libclntsh.so"; + ''; + + # Check need an Oracle database to run doCheck = false; meta = with stdenv.lib; { |