public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
This commit is contained in:
Yury G. Kudryashov
2012-01-08 16:01:12 +00:00
parent 0b90cd41b2 47288a2224
commit 9ee0a9df9b
237 changed files with 3563 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/pmount/default.nix
+3 -5
View File
@@ -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.