diff options
| author | Thomas Strobel <ts468@cam.ac.uk> | 2015-07-04 16:30:24 +0200 |
|---|---|---|
| committer | Thomas Strobel <ts468@cam.ac.uk> | 2015-07-04 16:36:47 +0200 |
| commit | 5a5587ba6d209ac19857274a76b7e07450af527f (patch) | |
| tree | 6f3ac8d235c10d73d5839045e092f8a9064cf915 /pkgs/os-specific/linux/pam_mount/default.nix | |
| parent | 8722e5453e58026c7be50b3f19368d8906ee02f1 (diff) | |
| download | nixpkgs-5a5587ba6d209ac19857274a76b7e07450af527f.tar nixpkgs-5a5587ba6d209ac19857274a76b7e07450af527f.tar.gz nixpkgs-5a5587ba6d209ac19857274a76b7e07450af527f.tar.bz2 nixpkgs-5a5587ba6d209ac19857274a76b7e07450af527f.tar.lz nixpkgs-5a5587ba6d209ac19857274a76b7e07450af527f.tar.xz nixpkgs-5a5587ba6d209ac19857274a76b7e07450af527f.tar.zst nixpkgs-5a5587ba6d209ac19857274a76b7e07450af527f.zip | |
pam_mount: fix PATH issue
Diffstat (limited to 'pkgs/os-specific/linux/pam_mount/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/pam_mount/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 0cf41276153..a4f52517df4 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }: +{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }: stdenv.mkDerivation rec { name = "pam_mount-2.15"; @@ -10,12 +10,18 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; - preConfigure = "sh autogen.sh --prefix=$out"; + patches = [ ./insert_utillinux_path_hooks.patch ]; + + preConfigure = '' + substituteInPlace src/mtcrypt.c --replace @@NIX_UTILLINUX@@ ${utillinux}/bin + sh autogen.sh --prefix=$out + ''; makeFlags = "DESTDIR=$(out)"; # Probably a hack, but using DESTDIR and PREFIX makes everything work! postInstall = '' + mkdir -p $out cp -r $out/$out/* $out rm -r $out/nix ''; |