Merge pull request #255331 from yu-re-ka/parallel-cross

authored by

Artturi and committed by
GitHub
dc1668ab 1f832ad5

+7 -1
+7 -1
pkgs/tools/misc/parallel/default.nix
··· 1 - { fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils }: 2 3 stdenv.mkDerivation rec { 4 pname = "parallel"; ··· 13 14 nativeBuildInputs = [ makeWrapper ]; 15 buildInputs = [ perl procps ]; 16 17 preInstall = '' 18 patchShebangs ./src/parallel ··· 48 license = licenses.gpl3Plus; 49 platforms = platforms.all; 50 maintainers = with maintainers; [ pSub vrthra tomberek ]; 51 }; 52 }
··· 1 + { fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils, buildPackages }: 2 3 stdenv.mkDerivation rec { 4 pname = "parallel"; ··· 13 14 nativeBuildInputs = [ makeWrapper ]; 15 buildInputs = [ perl procps ]; 16 + 17 + postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 18 + substituteInPlace Makefile.in \ 19 + --replace '$(DESTDIR)$(bindir)/parallel --shell-completion' '${lib.getExe buildPackages.parallel} --shell-completion' 20 + ''; 21 22 preInstall = '' 23 patchShebangs ./src/parallel ··· 53 license = licenses.gpl3Plus; 54 platforms = platforms.all; 55 maintainers = with maintainers; [ pSub vrthra tomberek ]; 56 + mainProgram = "parallel"; 57 }; 58 }