diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-02 23:30:27 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-02 23:30:27 +0000 |
| commit | 713f5e270b63c65120cea007d9f56f80f14323f4 (patch) | |
| tree | 94585195f2ece0e9d635c706c82cc1c00edbe8d4 /pkgs/tools/filesystems | |
| parent | 51fbb395cc690c476885ae2904ea6bfd6a4be7c4 (diff) | |
| download | nixpkgs-713f5e270b63c65120cea007d9f56f80f14323f4.tar nixpkgs-713f5e270b63c65120cea007d9f56f80f14323f4.tar.gz nixpkgs-713f5e270b63c65120cea007d9f56f80f14323f4.tar.bz2 nixpkgs-713f5e270b63c65120cea007d9f56f80f14323f4.tar.lz nixpkgs-713f5e270b63c65120cea007d9f56f80f14323f4.tar.xz nixpkgs-713f5e270b63c65120cea007d9f56f80f14323f4.tar.zst nixpkgs-713f5e270b63c65120cea007d9f56f80f14323f4.zip | |
Revert "btrfs-progs: fix on cross compilation"
This reverts commit 820927cb2c2ccb5bd9a938337228ea9c78400b49. Broke the native build: https://github.com/NixOS/nixpkgs/commit/820927cb2c2ccb5bd9a938337228ea9c78400b49#commitcomment-31529024
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 1d6285331c4..252f25ad8fa 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, python, pythonPackages +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages }: stdenv.mkDerivation rec { @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python pythonPackages.setuptools + pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools ]; - buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python ]; + buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ]; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally |