diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-04-29 15:45:07 -0400 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2024-04-29 15:45:57 -0400 |
| commit | 5009a8a1edd49652490850687d053f05f0e22f62 (patch) | |
| tree | 7091632fbe60155e0de2c90520559395c8aaaf3d /pkgs/top-level/perl-packages.nix | |
| parent | adc9566b3274444f7924bc1debf9eac0a3e5775b (diff) | |
perl538Packages.MusicBrainzDiscID: fix cross compilation, drop outdated LD envvar
Diffstat (limited to 'pkgs/top-level/perl-packages.nix')
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 32f4f45833786..42226374159fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18175,9 +18175,11 @@ with self; { url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.06.tar.gz"; hash = "sha256-ugtu0JiX/1Y7pZhy7pNxW+83FXUVsZt8bW8obmVI7Ks="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' - # Makefile.PL in this package uses which to find pkg-config -- make it use path instead - patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Makefile.PL''; + # Makefile.PL in this package uses which to find pkg-config -- make it use envvar instead + postPatch = '' + substituteInPlace Makefile.PL \ + --replace-fail '`which pkg-config`' "'$PKG_CONFIG'" + ''; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; |