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

Merge pull request #37512 from MHOOO/patch-1

Browse Source 
Fix spark scripts that use dirname
This commit is contained in:
Matthew Justin Bauer 2018-04-17 10:41:12 -05:00 committed by GitHub
commit 2f0f9b4d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/cluster/spark/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, makeWrapper, jre, pythonPackages { stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils
, RSupport? true, R , RSupport? true, R
, mesosSupport ? true, mesos , mesosSupport ? true, mesos
, version , version
@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do
makeWrapper "$n" "$out/bin/$(basename $n)" makeWrapper "$n" "$out/bin/$(basename $n)"
substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname
done done
ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java
''; '';