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

Merge pull request #51886 from Mic92/zfs-python3

Browse Source 
zfs: switch to python3
This commit is contained in:
Jörg Thalheim 2018-12-12 08:11:46 +00:00 committed by GitHub
commit 1933e8be0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -3,7 +3,7 @@
, configFile ? "all" , configFile ? "all"
# Userspace dependencies # Userspace dependencies
, zlib, libuuid, python, attr, openssl , zlib, libuuid, python3, attr, openssl
, libtirpc , libtirpc
, nfs-utils , nfs-utils
, gawk, gnugrep, gnused, systemd , gawk, gnugrep, gnused, systemd
@ -54,7 +54,7 @@ let
++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);
buildInputs = buildInputs =
optionals buildKernel [ spl ] optionals buildKernel [ spl ]
++ optionals buildUser [ zlib libuuid python attr ] ++ optionals buildUser [ zlib libuuid python3 attr ]
++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ] ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ]
++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; ++ optional stdenv.hostPlatform.isMusl [ libtirpc ];