diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/os-specific/linux/pam_mount/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/os-specific/linux/pam_mount/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/pam_mount/default.nix | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 18bc84effa0..5e4e15c364b 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,37 +1,46 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: stdenv.mkDerivation rec { - name = "pam_mount-2.16"; + pname = "pam_mount"; + version = "2.17"; src = fetchurl { - url = "mirror://sourceforge/pam-mount/pam_mount/2.16/${name}.tar.xz"; - sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"; + url = "mirror://sourceforge/pam-mount/pam_mount/${pname}-${version}.tar.xz"; + sha256 = "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + patches = [ + ./insert_utillinux_path_hooks.patch + ]; - patches = [ ./insert_utillinux_path_hooks.patch ]; + postPatch = '' + substituteInPlace src/mtcrypt.c \ + --replace @@NIX_UTILLINUX@@ ${util-linux}/bin + ''; - preConfigure = '' - substituteInPlace src/mtcrypt.c --replace @@NIX_UTILLINUX@@ ${utillinux}/bin - sh autogen.sh --prefix=$out - ''; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; - makeFlags = [ "DESTDIR=$(out)" ]; + buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--localstatedir=${placeholder "out"}/var" + "--sbindir=${placeholder "out"}/bin" + "--sysconfdir=${placeholder "out"}/etc" + "--with-slibdir=${placeholder "out"}/lib" + ]; - # Probably a hack, but using DESTDIR and PREFIX makes everything work! postInstall = '' - mkdir -p $out - cp -r $out/$out/* $out - rm -r $out/nix - ''; + rm -r $out/var + ''; - meta = with stdenv.lib; { - homepage = "http://pam-mount.sourceforge.net/"; + meta = with lib; { description = "PAM module to mount volumes for a user session"; - maintainers = [ maintainers.tstrobel ]; + homepage = "https://pam-mount.sourceforge.net/"; license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; } |