diff options
| author | Robin Gloster <mail@glob.in> | 2019-08-21 23:35:51 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-08-21 23:35:51 +0200 |
| commit | a3251aa64469bacb764b84e335e205487cd25452 (patch) | |
| tree | 8fb8693969cb66e5ec52633784c4cf43688447c3 /pkgs | |
| parent | 353323e055f35bbd765413c262ace0e63ac8dcfd (diff) | |
| download | nixpkgs-a3251aa64469bacb764b84e335e205487cd25452.tar nixpkgs-a3251aa64469bacb764b84e335e205487cd25452.tar.gz nixpkgs-a3251aa64469bacb764b84e335e205487cd25452.tar.bz2 nixpkgs-a3251aa64469bacb764b84e335e205487cd25452.tar.lz nixpkgs-a3251aa64469bacb764b84e335e205487cd25452.tar.xz nixpkgs-a3251aa64469bacb764b84e335e205487cd25452.tar.zst nixpkgs-a3251aa64469bacb764b84e335e205487cd25452.zip | |
hadoop: fix infinite recursion
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/hadoop/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 39d942ecbb5..376f8113b23 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -3,7 +3,7 @@ }: let - common = { version, sha256, dependencies-sha256, tomcat, openssl ? openssl }: + common = { version, sha256, dependencies-sha256, tomcat, opensslPkg ? openssl }: let # compile the hadoop tarball from sources, it requires some patches binary-distributon = stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ let }; nativeBuildInputs = [ maven cmake pkgconfig ]; - buildInputs = [ fuse snappy zlib bzip2 openssl protobuf2_5 ]; + buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated postPatch = '' for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ @@ -86,7 +86,7 @@ let mv $n $out/bin.wrapped/ makeWrapper $out/bin.wrapped/$(basename $n) $n \ --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ - --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \ + --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ opensslPkg snappy zlib bzip2 ]}" \ --set JAVA_HOME "${jre}" \ --set HADOOP_PREFIX "$out" fi @@ -129,21 +129,21 @@ in { sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; - openssl = openssl_1_0_2; + opensslPkg = openssl_1_0_2; }; hadoop_2_8 = common { version = "2.8.4"; sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w"; dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03"; tomcat = tomcat_6_0_48; - openssl = openssl_1_0_2; + opensslPkg = openssl_1_0_2; }; hadoop_2_9 = common { version = "2.9.1"; sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7"; dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x"; tomcat = tomcat_6_0_48; - openssl = openssl_1_0_2; + opensslPkg = openssl_1_0_2; }; hadoop_3_0 = common { version = "3.0.3"; |