ssh-ident: change PATH

The wrapper is not working anymore, so the ssh-agent is no more shared,
as the script removes the environment PATH variable, I pinned the
ssh-agent binary and removed the wrapper.

Also, as this script doesn't require a compiler, I switched from stdenv
to stdenvNoCC.

+12 -9
+12 -9
pkgs/tools/networking/ssh-ident/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, python3, makeWrapper, openssh }: 2 3 - stdenv.mkDerivation { 4 pname = "ssh-ident"; 5 version = "2016-04-21"; 6 src = fetchFromGitHub { ··· 10 sha256 = "1jf19lz1gwn7cyp57j8d4zs5bq13iw3kw31m8nvr8h6sib2pf815"; 11 }; 12 13 - buildInputs = [ python3 makeWrapper ]; 14 installPhase = '' 15 mkdir -p $out/bin 16 install -m 755 ssh-ident $out/bin/ssh-ident 17 - wrapProgram $out/bin/ssh-ident \ 18 - --prefix PATH : ${lib.makeBinPath [ openssh ]} 19 ''; 20 21 - meta = { 22 homepage = "https://github.com/ccontavalli/ssh-ident"; 23 description = "Start and use ssh-agent and load identities as necessary"; 24 - license = lib.licenses.bsd2; 25 - maintainers = with lib.maintainers; [ telotortium ]; 26 - platforms = with lib.platforms; unix; 27 }; 28 }
··· 1 + { stdenvNoCC, lib, fetchFromGitHub, python3, openssh}: 2 3 + stdenvNoCC.mkDerivation { 4 pname = "ssh-ident"; 5 version = "2016-04-21"; 6 src = fetchFromGitHub { ··· 10 sha256 = "1jf19lz1gwn7cyp57j8d4zs5bq13iw3kw31m8nvr8h6sib2pf815"; 11 }; 12 13 + postPatch = '' 14 + substituteInPlace ssh-ident \ 15 + --replace 'ssh-agent >' '${openssh}/bin/ssh-agent >' 16 + ''; 17 + buildInputs = [ python3 ]; 18 + 19 installPhase = '' 20 mkdir -p $out/bin 21 install -m 755 ssh-ident $out/bin/ssh-ident 22 ''; 23 24 + meta = with lib; { 25 homepage = "https://github.com/ccontavalli/ssh-ident"; 26 description = "Start and use ssh-agent and load identities as necessary"; 27 + license = licenses.bsd2; 28 + maintainers = with maintainers; [ telotortium ]; 29 + platforms = with platforms; unix; 30 }; 31 }