diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-05-10 11:27:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 11:27:14 +0200 |
| commit | 53717915c945159f430c08ec4266ba5c70d4dd7f (patch) | |
| tree | 054456395c58a81eea163896f7be9d94ee49b264 /pkgs | |
| parent | 007f41bff839d05e3533bfcb2705999a4b1ee752 (diff) | |
| parent | a1347423d217390ac86cf406350a6d6d867a3575 (diff) | |
Merge pull request #304018 from amarshall/parallel-full-improve
parallel-full: fix missing files
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/parallel/wrapper.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/tools/misc/parallel/wrapper.nix index 0240f1ac9e9ec..b798a1acea227 100644 --- a/pkgs/tools/misc/parallel/wrapper.nix +++ b/pkgs/tools/misc/parallel/wrapper.nix @@ -1,10 +1,18 @@ -{ lib, runCommand, makeWrapper, parallel, perlPackages +{ lib, symlinkJoin, makeWrapper, parallel, perlPackages , extraPerlPackages ? with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] , willCite ? false }: -runCommand "parallel-full" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ - --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" \ - ${lib.optionalString willCite "--add-flags --will-cite"} -'' +symlinkJoin { + name = "parallel-full-${parallel.version}"; + inherit (parallel) pname version meta outputs; + nativeBuildInputs = [ makeWrapper ]; + paths = [ parallel ]; + postBuild = '' + ${lib.concatMapStringsSep "\n" (output: "ln -s --no-target-directory ${parallel.${output}} \$${output}") (lib.remove "out" parallel.outputs)} + + rm $out/bin/parallel + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" \ + ${lib.optionalString willCite "--add-flags --will-cite"} + ''; +} |