* Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...). svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
This commit is contained in:
@@ -34,10 +34,9 @@ stdenv.mkDerivation rec {
|
||||
++ stdenv.lib.optional x11Support x11
|
||||
++ stdenv.lib.optional cupsSupport cups;
|
||||
|
||||
configureFlags = "
|
||||
--disable-static
|
||||
configureFlags = ''
|
||||
${if x11Support then "--with-x" else "--without-x"}
|
||||
";
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fpic";
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
--replace /bin/umount ${utillinux}/bin/umount
|
||||
'';
|
||||
|
||||
configureFlags = "--enable-shared --disable-static --disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper";
|
||||
configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.ntfs-3g.org;
|
||||
|
||||
Reference in New Issue
Block a user