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: 9a8844cc6b46
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aec558774bdd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 27, 2020

  1. file-rename: Fix an incorrect platform test that misidentifies Darwin… 

    … as Windows

This causes the script to be installed as `file-rename` instead of `rename` like
it is on other Unix systems. This in turn causes `wrapProgram` to fail when
building because it expects the wrapped program to be called `rename`.
    @neilmayhew
    neilmayhew committed Jun 27, 2020
    Copy the full SHA
    1d0a930 View commit details

Commits on Jun 28, 2020

  1. Merge pull request #91699 from neilmayhew/fix/file-rename/darwin 

    file-rename: Fix an incorrect test that misidentifies Darwin as Windows
    @nh2
    nh2 authored Jun 28, 2020
    Copy the full SHA
    aec5587 View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/tools/filesystems/file-rename/default.nix
6 changes: 6 additions & 0 deletions pkgs/tools/filesystems/file-rename/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,12 @@ perlPackages.buildPerlPackage {

nativeBuildInputs = [ makeWrapper ];

# Fix an incorrect platform test that misidentifies Darwin as Windows
postPatch = ''
substituteInPlace Makefile.PL \
--replace '/win/i' '/MSWin32/'
'';

postInstall = ''
wrapProgram $out/bin/rename \
--prefix PERL5LIB : $out/${perlPackages.perl.libPrefix}