public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssh: Refactor and install sample config files

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-06 19:29:45 -07:00
parent 3cfc6fa38a
commit 81ace52e89
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/tools/networking/openssh/default.nix
View File

@ -13,10 +13,9 @@ let
url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz; url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz;
sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
}; };
optionalString = stdenv.lib.optionalString;
in in
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openssh-6.8p1"; name = "openssh-6.8p1";
@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
sha256 = "03hnrqvjq6ghg1mp3gkarfxh6g3x1n1vjrzpbc5lh9717vklrxiz"; sha256 = "03hnrqvjq6ghg1mp3gkarfxh6g3x1n1vjrzpbc5lh9717vklrxiz";
}; };
prePatch = stdenv.lib.optionalString hpnSupport prePatch = optionalString hpnSupport
'' ''
gunzip -c ${hpnSrc} | patch -p1 gunzip -c ${hpnSrc} | patch -p1
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
@ -34,43 +33,39 @@ stdenv.mkDerivation rec {
patches = [ ./locale_archive.patch ]; patches = [ ./locale_archive.patch ];
buildInputs = [ zlib openssl libedit pkgconfig pam ] buildInputs = [ zlib openssl libedit pkgconfig pam ]
++ stdenv.lib.optional withKerberos [ kerberos ]; ++ optional withKerberos [ kerberos ];
# I set --disable-strip because later we strip anyway. And it fails to strip # I set --disable-strip because later we strip anyway. And it fails to strip
# properly when cross building. # properly when cross building.
configureFlags = configureFlags = [
'' "--localstatedir=/var"
--with-mantype=man "--with-mantype=man"
--with-libedit=yes "--with-libedit=yes"
--disable-strip "--disable-strip"
${if pam != null then "--with-pam" else "--without-pam"} (if pam != null then "--with-pam" else "--without-pam")
${optionalString (etcDir != null) "--sysconfdir=${etcDir}"} ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
${optionalString withKerberos "--with-kerberos5=${kerberos}"} ++ optional withKerberos "--with-kerberos5=${kerberos}"
${optionalString stdenv.isDarwin "--disable-libutil"} ++ optional stdenv.isDarwin "--disable-libutil";
'';
preConfigure = preConfigure = ''
'' configureFlagsArray+=("--with-privsep-path=$out/empty")
configureFlags="$configureFlags --with-privsep-path=$out/empty"
mkdir -p $out/empty mkdir -p $out/empty
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = postInstall = ''
''
# Install ssh-copy-id, it's very useful. # Install ssh-copy-id, it's very useful.
cp contrib/ssh-copy-id $out/bin/ cp contrib/ssh-copy-id $out/bin/
chmod +x $out/bin/ssh-copy-id chmod +x $out/bin/ssh-copy-id
cp contrib/ssh-copy-id.1 $out/share/man/man1/ cp contrib/ssh-copy-id.1 $out/share/man/man1/
mkdir -p $out/etc/ssh
cp moduli $out/etc/ssh/
''; '';
installTargets = "install-nosysconf"; installFlags = [
"sysconfdir=\${out}/etc/ssh"
];
meta = with stdenv.lib; { meta = {
homepage = "http://www.openssh.org/"; homepage = "http://www.openssh.org/";
description = "An implementation of the SSH protocol"; description = "An implementation of the SSH protocol";
license = stdenv.lib.licenses.bsd2; license = stdenv.lib.licenses.bsd2;