diff options
| author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
| commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
| tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/development/libraries/oracle-instantclient | |
| parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) | |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
Diffstat (limited to 'pkgs/development/libraries/oracle-instantclient')
| -rw-r--r-- | pkgs/development/libraries/oracle-instantclient/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index fe260e0c2ad2..2e90d867b5a7 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -37,7 +37,7 @@ let extLib = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation rec { inherit version srcs; - name = "oracle-instantclient-${version}"; + pname = "oracle-instantclient"; buildInputs = [ stdenv.cc.cc.lib ] ++ optionals (stdenv.isLinux) [ libaio ] @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { unpackCmd = "unzip $curSrc"; installPhase = '' - mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"} + mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} install -Dm755 {sqlplus,adrci,genezi} $out/bin ${optionalString stdenv.isDarwin '' for exe in "$out/bin/"* ; do @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { install -Dm644 *${extLib}* $out/lib install -Dm644 *.jar $out/share/java install -Dm644 sdk/include/* $out/include - install -Dm644 sdk/demo/* $out/share/${name}/demo + install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo # PECL::oci8 will not build without this # this symlink only exists in dist zipfiles for some platforms |