nix-serve: set PATH

joachifm: also set `dontBuild = true`; `false` doesn't make any sense if
the intent is to skip the build phase.

Closes #16221

authored by Allen Nelson and committed by Joachim Fasting d20a8dde c7016de7

+14 -9
+14 -9
pkgs/tools/package-management/nix-serve/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, perl, nix, perlPackages }: 1 + { stdenv, fetchFromGitHub, 2 + bzip2, nix, perl, perlPackages, 3 + }: 2 4 3 - let rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d"; in 5 + with stdenv.lib; 6 + 7 + let 8 + rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d"; 9 + sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj"; 10 + in 4 11 5 12 stdenv.mkDerivation rec { 6 - name = "nix-serve-0.2-${lib.substring 0 7 rev}"; 13 + name = "nix-serve-0.2-${substring 0 7 rev}"; 7 14 8 15 src = fetchFromGitHub { 9 16 owner = "edolstra"; 10 17 repo = "nix-serve"; 11 - inherit rev; 12 - sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj"; 18 + inherit rev sha256; 13 19 }; 14 20 15 - buildInputs = [ perl nix ] 21 + buildInputs = [ bzip2 perl nix ] 16 22 ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]); 17 23 18 - dontBuild = false; 24 + dontBuild = true; 19 25 20 - # FIXME: unfortunate cut&paste. 21 26 installPhase = '' 22 27 mkdir -p $out/libexec/nix-serve 23 28 cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi ··· 25 30 mkdir -p $out/bin 26 31 cat > $out/bin/nix-serve <<EOF 27 32 #! ${stdenv.shell} 28 - PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" 33 + PATH=${makeBinPath [ bzip2 nix ]}:\$PATH PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" 29 34 EOF 30 35 chmod +x $out/bin/nix-serve 31 36 '';