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

Merge pull request #5882 from paraseba/zfspython

Browse Source 
Fixup zfs python scripts
This commit is contained in:
Georges Dubus 2015-01-21 14:56:47 +01:00
commit 62d0ad3ce0
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/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: { stdenv, fetchFromGitHub, kernel, spl, perl, python, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zfs-${version}-${kernel.version}"; name = "zfs-${version}-${kernel.version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
./nix-build.patch # Remove in >=0.6.4 ./nix-build.patch # Remove in >=0.6.4
]; ];
buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; buildInputs = [ spl 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";