diff options
author | Florian Klink <flokli@flokli.de> | 2018-05-17 18:43:25 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2018-05-17 19:15:57 +0200 |
commit | 639f7952be31f89d22512bf661d03a4fe2b075a2 (patch) | |
tree | 0612aea45630f393039f09d4ad2f021b773ec139 /pkgs/development/python-modules | |
parent | a88354d99f8298a45a2e5e3632fb793a83f2b940 (diff) | |
download | nixlib-639f7952be31f89d22512bf661d03a4fe2b075a2.tar nixlib-639f7952be31f89d22512bf661d03a4fe2b075a2.tar.gz nixlib-639f7952be31f89d22512bf661d03a4fe2b075a2.tar.bz2 nixlib-639f7952be31f89d22512bf661d03a4fe2b075a2.tar.lz nixlib-639f7952be31f89d22512bf661d03a4fe2b075a2.tar.xz nixlib-639f7952be31f89d22512bf661d03a4fe2b075a2.tar.zst nixlib-639f7952be31f89d22512bf661d03a4fe2b075a2.zip |
pythonPackages.cx_oracle: fix dlopen
previously, $ORACLE_HOME had to be set for each python script using this library. We now patch odpi to load libclntsh.so from oracle-instantclient if $ORACLE_HOME was not provided.
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch | 27 | ||||
-rw-r--r-- | pkgs/development/python-modules/cx_oracle/default.nix | 6 |
2 files changed, 33 insertions, 0 deletions
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 637518b1969b..c9925fad88d4 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -13,6 +13,12 @@ buildPythonPackage rec { 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"; + ''; + # Check need an Oracle database to run doCheck = false; |