diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-26 17:13:41 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-02 14:12:42 -0600 |
commit | 820927cb2c2ccb5bd9a938337228ea9c78400b49 (patch) | |
tree | a1824ab60017353e640d5f851ff245861b44e733 /pkgs | |
parent | 7a2c07d29bf9bb7582e5df2dfcb879278d65a8e8 (diff) | |
download | nixlib-820927cb2c2ccb5bd9a938337228ea9c78400b49.tar nixlib-820927cb2c2ccb5bd9a938337228ea9c78400b49.tar.gz nixlib-820927cb2c2ccb5bd9a938337228ea9c78400b49.tar.bz2 nixlib-820927cb2c2ccb5bd9a938337228ea9c78400b49.tar.lz nixlib-820927cb2c2ccb5bd9a938337228ea9c78400b49.tar.xz nixlib-820927cb2c2ccb5bd9a938337228ea9c78400b49.tar.zst nixlib-820927cb2c2ccb5bd9a938337228ea9c78400b49.zip |
btrfs-progs: fix on cross compilation
Fixes #50925 (cherry picked from commit 04978d152e8e8e0c2f82cbb8c2addc4ecc93c79c)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 252f25ad8fa8..1d6285331c4e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python, pythonPackages }: stdenv.mkDerivation rec { @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools + pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python pythonPackages.setuptools ]; - buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ]; + buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python ]; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally |