diff options
| author | volth <volth@webmaster.ms> | 2019-04-21 19:27:55 +0000 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2021-03-31 21:35:37 +0200 |
| commit | a480ba06d999357298c6635442331a9900bf61b0 (patch) | |
| tree | 58be61ecb5c8e1dd8629e34d9c81063ed16437f3 /pkgs/tools/package-management/nix-serve/default.nix | |
| parent | 61b7cab4811e0e90937bcc8b4c1ca32b387c895c (diff) | |
| download | nixpkgs-a480ba06d999357298c6635442331a9900bf61b0.tar nixpkgs-a480ba06d999357298c6635442331a9900bf61b0.tar.gz nixpkgs-a480ba06d999357298c6635442331a9900bf61b0.tar.bz2 nixpkgs-a480ba06d999357298c6635442331a9900bf61b0.tar.lz nixpkgs-a480ba06d999357298c6635442331a9900bf61b0.tar.xz nixpkgs-a480ba06d999357298c6635442331a9900bf61b0.tar.zst nixpkgs-a480ba06d999357298c6635442331a9900bf61b0.zip | |
nix-serve: $PERL5LIB -> perl.withPackages
Diffstat (limited to 'pkgs/tools/package-management/nix-serve/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/nix-serve/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index d468b2d2ade..f85adee4917 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, - bzip2, nix, perl, perlPackages, + bzip2, nix, perl, makeWrapper, }: with lib; @@ -18,21 +18,16 @@ stdenv.mkDerivation { inherit rev sha256; }; - buildInputs = [ bzip2 perl nix nix.perl-bindings ] - ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]); + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; installPhase = '' - mkdir -p $out/libexec/nix-serve - cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi - - mkdir -p $out/bin - cat > $out/bin/nix-serve <<EOF - #! ${stdenv.shell} - PATH=${makeBinPath [ bzip2 nix ]}:\$PATH PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" - EOF - chmod +x $out/bin/nix-serve + install -Dm0755 nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi + + makeWrapper ${perl.withPackages(p: [ p.DBDSQLite p.Plack p.Starman nix.perl-bindings ])}/bin/starman $out/bin/nix-serve \ + --prefix PATH : "${makeBinPath [ bzip2 nix ]}" \ + --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; meta = { |