Merge pull request #4092 from ts468/pam_mount

New packages: pam_mount and libHX
This commit is contained in:
Rob Vermaas 2014-09-17 13:15:22 +02:00
commit f7f9580545
4 changed files with 63 additions and 0 deletions

View File

@ -118,6 +118,7 @@
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
tv = "Tomislav Viljetić <tv@shackspace.de>";
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";

View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
name = "libHX-3.21";
src = fetchurl {
url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz";
sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v";
};
patches = [];
buildInputs = [ autoconf automake libtool ];
preConfigure = ''
sh autogen.sh
'';
meta = {
homepage = http://libhx.sourceforge.net/;
longDescription = ''
libHX is a C library (with some C++ bindings available) that provides data structures
and functions commonly needed, such as maps, deques, linked lists, string formatting
and autoresizing, option and config file parsing, type checking casts and more.
'';
maintainers = [ stdenv.lib.maintainers.tstrobel ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }:
stdenv.mkDerivation rec {
name = "pam_mount-2.14";
src = fetchurl {
url = "mirror://sourceforge/pam-mount/pam_mount/2.14/${name}.tar.xz";
sha256 = "1yfwg8i4n7af8yi3w3pkqzqz75wgjjlg5lslv1r5g1v88nrwnrkg";
};
buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
preConfigure = "sh autogen.sh --prefix=$out";
makeFlags = "DESTDIR=$(out)";
# Probably a hack, but using DESTDIR and PREFIX makes everything work!
postInstall = ''
cp -r $out/$out/* $out
rm -r $out/nix
'';
meta = {
homepage = http://pam-mount.sourceforge.net/;
description = "PAM module to mount volumes for a user session";
maintainers = [ stdenv.lib.maintainers.tstrobel ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -5432,6 +5432,8 @@ let
libharu = callPackage ../development/libraries/libharu { };
libHX = callPackage ../development/libraries/libHX { };
libibmad = callPackage ../development/libraries/libibmad { };
libibumad = callPackage ../development/libraries/libibumad { };
@ -7902,6 +7904,8 @@ let
pam_login = callPackage ../os-specific/linux/pam_login { };
pam_mount = callPackage ../os-specific/linux/pam_mount { };
pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
pam_usb = callPackage ../os-specific/linux/pam_usb { };