diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:31:54 +0100 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:31:54 +0100 |
| commit | 609f8dc04b4604124e742bb114af9377d203a4cc (patch) | |
| tree | 096dc9b70379e449392b557fb1d9b3e0faf53258 /pkgs/tools/filesystems | |
| parent | b60d44a00a9218eccf1190bcc6bbb6ec929358d9 (diff) | |
| parent | b6519f08da3321a8bc002e6608297a3225cc5439 (diff) | |
| download | nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.gz nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.bz2 nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.lz nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.xz nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.zst nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.zip | |
Merge branch 'master' into stdenv-updates
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/btrfsprogs/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 9c8d18231f0f..0661755d2e17 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -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 ''; |