Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4e292b04af69
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47d121591c96
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2021

  1. texi2html: Fix cross-platform build

    @kampka
    kampka committed Jan 12, 2021
    Copy the full SHA
    0fd3afc View commit details

Commits on Jan 17, 2021

  1. Merge pull request #97093 from kampka/texi2html 

    texi2html: Fix cross-platform build
    @symphorien
    symphorien authored Jan 17, 2021
    Copy the full SHA
    47d1215 View commit details
Showing with 12 additions and 5 deletions.
  1. +12 −5 pkgs/development/tools/misc/texi2html/default.nix
17 changes: 12 additions & 5 deletions pkgs/development/tools/misc/texi2html/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, gettext }:
{ stdenv, fetchurl, perl, gettext, buildPackages }:

stdenv.mkDerivation rec {
pname = "texi2html";
@@ -9,12 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8";
};

nativeBuildInputs = [ gettext ];
strictDeps = true;

nativeBuildInputs = [ gettext perl ];
buildInputs = [ perl ];

preBuild = ''
substituteInPlace separated_to_hash.pl \
--replace "/usr/bin/perl" "${perl}/bin/perl"
postPatch = ''
patchShebangs separated_to_hash.pl
'';

postInstall = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
for f in $out/bin/*; do
substituteInPlace $f --replace "${buildPackages.perl}" "${perl}"
done
'';

meta = with stdenv.lib; {