diff options
author | Florian Klink <flokli@flokli.de> | 2019-08-21 02:55:59 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2019-08-22 11:22:48 +0200 |
commit | 60816110465845b6a2a955b145447d4343f63bf0 (patch) | |
tree | 2d6e9a0f490e0fb37cba77705eb881979aec5642 /pkgs | |
parent | d9617978fb78de81f3a2952a344b19be8388add4 (diff) | |
download | nixpkgs-60816110465845b6a2a955b145447d4343f63bf0.tar nixpkgs-60816110465845b6a2a955b145447d4343f63bf0.tar.gz nixpkgs-60816110465845b6a2a955b145447d4343f63bf0.tar.bz2 nixpkgs-60816110465845b6a2a955b145447d4343f63bf0.tar.lz nixpkgs-60816110465845b6a2a955b145447d4343f63bf0.tar.xz nixpkgs-60816110465845b6a2a955b145447d4343f63bf0.tar.zst nixpkgs-60816110465845b6a2a955b145447d4343f63bf0.zip |
oracle-instantclient: turn into a multi-output derivation
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/odpic/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/oracle-instantclient/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/perl-modules/DBD-Oracle/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 7 |
4 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 931ecc186be..84957cae127 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; libPath = stdenv.lib.makeLibraryPath - [ oracle-instantclient ]; + [ oracle-instantclient.lib ]; dontPatchELF = true; makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index fe260e0c2ad..ffdf342b2f9 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -47,18 +47,15 @@ in stdenv.mkDerivation rec { ++ optional stdenv.isLinux autoPatchelfHook ++ optional stdenv.isDarwin fixDarwinDylibNames; + outputs = [ "out" "dev" "lib"]; + unpackCmd = "unzip $curSrc"; installPhase = '' - mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"} - install -Dm755 {sqlplus,adrci,genezi} $out/bin - ${optionalString stdenv.isDarwin '' - for exe in "$out/bin/"* ; do - install_name_tool -add_rpath "$out/lib" "$exe" - done - ''} - ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 - install -Dm644 *${extLib}* $out/lib + mkdir -p "$out/"{bin,include,"share/java","share/${name}/demo/"} $lib/lib + install -Dm755 {adrci,genezi,uidrvci,sqlplus} $out/bin + install -Dm644 *${extLib}* $lib/lib + install -Dm644 *.jar $out/share/java install -Dm644 sdk/include/* $out/include install -Dm644 sdk/demo/* $out/share/${name}/demo @@ -68,6 +65,15 @@ in stdenv.mkDerivation rec { ln -sfn $out/lib/libclntsh${extLib}.12.1 $out/lib/libclntsh${extLib} ''; + postFixup = optionalString stdenv.isDarwin '' + for exe in "$out/bin/"* ; do + if [ ! -L "$exe" ]; then + install_name_tool -add_rpath "$lib/lib" "$exe" + fi + done + ''; + + meta = with stdenv.lib; { description = "Oracle instant client libraries and sqlplus CLI"; longDescription = '' diff --git a/pkgs/development/perl-modules/DBD-Oracle/default.nix b/pkgs/development/perl-modules/DBD-Oracle/default.nix index a7ec1e2d182..a9d6a2798eb 100644 --- a/pkgs/development/perl-modules/DBD-Oracle/default.nix +++ b/pkgs/development/perl-modules/DBD-Oracle/default.nix @@ -9,7 +9,7 @@ buildPerlPackage { sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3"; }; - ORACLE_HOME = "${oracle-instantclient}/lib"; + ORACLE_HOME = "${oracle-instantclient.lib}/lib"; buildInputs = [ TestNoWarnings oracle-instantclient ] ; propagatedBuildInputs = [ DBI ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 801a9c9e30b..949896c1036 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -237,9 +237,12 @@ let pname = "oci8"; sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ]; + configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; }; pcs = buildPecl rec { |