diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
| commit | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch) | |
| tree | 5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/os-specific/linux/pmount | |
| parent | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff) | |
| parent | 47288a22242b0cd554efc45d446e67573ca308f7 (diff) | |
| download | nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2 nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip | |
svn merge ^/nixpkgs/trunk
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/os-specific/linux/pmount')
| -rw-r--r-- | pkgs/os-specific/linux/pmount/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index af2078b676a..4d555f59c37 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g, utillinux +{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; - buildInputs = [ hal intltool utillinux ]; + buildInputs = [ intltool utillinux ]; configureFlags = "" + " --with-media-dir=${mediaDir}" @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { + " --with-whitelist=${whiteList}" + " --with-mount-prog=${utillinux}/bin/mount" + " --with-umount-prog=${utillinux}/bin/umount" - + " --with-cryptsetup=${cryptsetup}/sbin/cryptsetup" - + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g" - + " --enable-hal"; + + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"; postConfigure = '' # etc/Mafile.am is hardcoded and it does not respect the --prefix option. |