diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-02 14:15:05 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-02 14:15:05 -0600 |
| commit | 973781444a5cf05cf7227b6bc1ce373f36c9ab0d (patch) | |
| tree | 068a28a442f0504fd75333c2f007cc5f77a21517 /pkgs/tools/filesystems | |
| parent | 5ae9250c3b4e49a4f67f15d404a4b1cbb429c4f8 (diff) | |
| parent | 820927cb2c2ccb5bd9a938337228ea9c78400b49 (diff) | |
| download | nixpkgs-973781444a5cf05cf7227b6bc1ce373f36c9ab0d.tar nixpkgs-973781444a5cf05cf7227b6bc1ce373f36c9ab0d.tar.gz nixpkgs-973781444a5cf05cf7227b6bc1ce373f36c9ab0d.tar.bz2 nixpkgs-973781444a5cf05cf7227b6bc1ce373f36c9ab0d.tar.lz nixpkgs-973781444a5cf05cf7227b6bc1ce373f36c9ab0d.tar.xz nixpkgs-973781444a5cf05cf7227b6bc1ce373f36c9ab0d.tar.zst nixpkgs-973781444a5cf05cf7227b6bc1ce373f36c9ab0d.zip | |
Merge branch 'darwin-fixes2'
Diffstat (limited to 'pkgs/tools/filesystems')
| -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 252f25ad8fa..1d6285331c4 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 |