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

Merge pull request #5890 from paraseba/zfspython

Browse Source 
Fixup zfs python scripts
This commit is contained in:
Ricardo M. Correia 2015-01-21 19:40:50 +01:00
commit 8bb25be986
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/zfs/git.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, kernel, spl_git, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: { stdenv, fetchgit, kernel, spl_git, perl, python, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zfs-0.6.4-${kernel.version}"; name = "zfs-0.6.4-${kernel.version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
./nix-build-git.patch ./nix-build-git.patch
]; ];
buildInputs = [ spl_git perl autoconf automake libtool zlib libuuid coreutils ]; buildInputs = [ spl_git perl python autoconf automake libtool zlib libuuid coreutils ];
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_CFLAGS_LINK = "-lgcc_s"; NIX_CFLAGS_LINK = "-lgcc_s";