pythonPackages.cx_oracle: use new odpic from nixpkgs

This commit is contained in:
Florian Klink 2018-06-04 21:41:45 +02:00 committed by Maciej Kazulak
parent 52de9e8206
commit b7e25adbde
2 changed files with 5 additions and 35 deletions

View File

@ -1,27 +0,0 @@
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

View File

@ -1,22 +1,19 @@
{ stdenv, buildPythonPackage, fetchPypi, oracle-instantclient }:
{ stdenv, buildPythonPackage, fetchPypi, odpic }:
buildPythonPackage rec {
pname = "cx_Oracle";
version = "6.3.1";
buildInputs = [
oracle-instantclient
];
buildInputs = [ odpic ];
src = fetchPypi {
inherit pname version;
sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
};
patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ];
postPatch = ''
substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ "${oracle-instantclient}/lib/libclntsh.so";
preConfigure = ''
export ODPIC_INC_DIR="${odpic}/include"
export ODPIC_LIB_DIR="${odpic}/lib"
'';
# Check need an Oracle database to run