diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-07 19:16:45 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-07 19:16:45 +0000 |
| commit | f4cfdb06191e1d65072b5b1aabfd6bd779ed4188 (patch) | |
| tree | 403fa0e04fc8faf8173deb3ae5f291c1e34143a1 /pkgs/os-specific/linux/pmount | |
| parent | cd6824cb9f60ace9e98b065f375cb6c493bc1f9f (diff) | |
| download | nixpkgs-f4cfdb06191e1d65072b5b1aabfd6bd779ed4188.tar nixpkgs-f4cfdb06191e1d65072b5b1aabfd6bd779ed4188.tar.gz nixpkgs-f4cfdb06191e1d65072b5b1aabfd6bd779ed4188.tar.bz2 nixpkgs-f4cfdb06191e1d65072b5b1aabfd6bd779ed4188.tar.lz nixpkgs-f4cfdb06191e1d65072b5b1aabfd6bd779ed4188.tar.xz nixpkgs-f4cfdb06191e1d65072b5b1aabfd6bd779ed4188.tar.zst nixpkgs-f4cfdb06191e1d65072b5b1aabfd6bd779ed4188.zip | |
pmount: disable HAL
pmount failed to find HAL for a long time, and nobody cared. So, I've just removed it. Also configure does not recognize "--with-cryptsetup", so I've removed it as well. svn path=/nixpkgs/trunk/; revision=31409
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 8f814c7212a..9366c2cf95f 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, utillinuxng +{stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinuxng , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; - buildInputs = [ hal intltool utillinuxng ]; + buildInputs = [ intltool utillinuxng ]; configureFlags = "" + " --with-media-dir=${mediaDir}" @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { + " --with-whitelist=${whiteList}" + " --with-mount-prog=${utillinuxng}/bin/mount" + " --with-umount-prog=${utillinuxng}/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. |