Merge branch 'master' into stdenv-updates

Conflicts: pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
parent b60d44a00a b6519f08da
commit 609f8dc04b
272 changed files with 4690 additions and 2945 deletions
@@ -13,6 +13,9 @@ stdenv.mkDerivation {

  buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ];

+  # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work
+  NIX_CFLAGS_LINK = "-lgcc_s";
+
  postPatch = ''
    cp ${./btrfs-set-received-uuid.c} btrfs-set-received-uuid.c
  '';