public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oracle-instantclient: drop PECL::oci8 hack

Browse Source 
This wasn't about PECL::oci8 in first place, but DBD-Oracle.

In the current version of oracle-instantclient, a libclntsh.so is
shipped, so DBD-Oracle is happy.
This commit is contained in:
Florian Klink 2019-08-22 00:00:33 +02:00
parent 2decc61d28
commit e9c53043a8
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/oracle-instantclient/default.nix
View File

@ -112,11 +112,7 @@ in stdenv.mkDerivation {
ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 ln -sfn $out/bin/sqlplus $out/bin/sqlplus64
''; '';
postFixup = '' postFixup = optionalString stdenv.isDarwin ''
# PECL::oci8 will not build without this
# this symlink only exists in dist zipfiles for some platforms
ln -sfn $out/lib/libclntsh${extLib}.12.1 $out/lib/libclntsh${extLib}
'' + optionalString stdenv.isDarwin ''
for exe in "$out/bin/"* ; do for exe in "$out/bin/"* ; do
if [ ! -L "$exe" ]; then if [ ! -L "$exe" ]; then
install_name_tool -add_rpath "$lib/lib" "$exe" install_name_tool -add_rpath "$lib/lib" "$exe"
@ -124,7 +120,6 @@ in stdenv.mkDerivation {
done done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Oracle instant client libraries and sqlplus CLI"; description = "Oracle instant client libraries and sqlplus CLI";
longDescription = '' longDescription = ''