summary refs log tree commit diff
path: root/pkgs/tools/networking/tgt
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2021-02-24 20:53:45 +0100
committerrnhmjoj <rnhmjoj@inventati.org>2021-03-31 21:35:37 +0200
commit61b7cab4811e0e90937bcc8b4c1ca32b387c895c (patch)
treedb5dc9f491f86fe61dc23dcf042ea6eed08327aa /pkgs/tools/networking/tgt
parent3966039910db296c1c2dca2120ab0976952fe11c (diff)
downloadnixpkgs-61b7cab4811e0e90937bcc8b4c1ca32b387c895c.tar
nixpkgs-61b7cab4811e0e90937bcc8b4c1ca32b387c895c.tar.gz
nixpkgs-61b7cab4811e0e90937bcc8b4c1ca32b387c895c.tar.bz2
nixpkgs-61b7cab4811e0e90937bcc8b4c1ca32b387c895c.tar.lz
nixpkgs-61b7cab4811e0e90937bcc8b4c1ca32b387c895c.tar.xz
nixpkgs-61b7cab4811e0e90937bcc8b4c1ca32b387c895c.tar.zst
nixpkgs-61b7cab4811e0e90937bcc8b4c1ca32b387c895c.zip
treewide: use perl.withPackages when possible
Since 03eaa48 added perl.withPackages, there is a canonical way to
create a perl interpreter from a list of libraries, for use in script
shebangs or generic build inputs. This method is declarative (what we
are doing is clear), produces short shebangs[1] and needs not to wrap
existing scripts.

Unfortunately there are a few exceptions that I've found:

  1. Scripts that are calling perl with the -T switch. This makes perl
  ignore PERL5LIB, which is what perl.withPackages is using to inform
  the interpreter of the library paths.

  2. Perl packages that depends on libraries in their own path. This
  is not possible because perl.withPackages works at build time. The
  workaround is to add `-I $out/${perl.libPrefix}` to the shebang.

In all other cases I propose to switch to perl.withPackages.

[1]: https://lwn.net/Articles/779997/
Diffstat (limited to 'pkgs/tools/networking/tgt')
-rw-r--r--pkgs/tools/networking/tgt/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix
index ca40f9a7cb7..ba1f89af433 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/pkgs/tools/networking/tgt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages
+{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl
 , docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux
 }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/sbin/tgt-admin \
-      --replace "#!/usr/bin/perl" "#! ${perl}/bin/perl -I${perlPackages.ConfigGeneral}/${perl.libPrefix}"
+      --replace "#!/usr/bin/perl" "#! ${perl.withPackages (p: [ p.ConfigGeneral ])}/bin/perl"
     wrapProgram $out/sbin/tgt-admin --prefix PATH : \
       ${lib.makeBinPath [ lsof sg3_utils (placeholder "out") ]}