From 713f5e270b63c65120cea007d9f56f80f14323f4 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 2 Dec 2018 23:30:27 +0000 Subject: Revert "btrfs-progs: fix on cross compilation" This reverts commit 820927cb2c2ccb5bd9a938337228ea9c78400b49. Broke the native build: https://github.com/NixOS/nixpkgs/commit/820927cb2c2ccb5bd9a938337228ea9c78400b49#commitcomment-31529024 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems/btrfs-progs/default.nix') 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 -- cgit 1.4.1