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

Merge pull request #198 from jcumming/zfs.121126.1

Browse Source 
Need pthread_cancel for zdb to work properly. Add -lgcc_s.
This commit is contained in:
Peter Simons 2012-11-28 01:18:08 -08:00
commit 7838d3568b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/zfs/default.nix
View File

@ -11,6 +11,8 @@ stdenv.mkDerivation {
buildInputs = [ kernel spl perl autoconf automake libtool zlib libuuid coreutils ]; buildInputs = [ kernel spl perl autoconf automake libtool zlib libuuid coreutils ];
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_CFLAGS_LINK = "-lgcc_s";
NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
preConfigure = '' preConfigure = ''