Skip to content

Commit

Permalink
Revert "btrfs-progs: fix on cross compilation"
Browse files Browse the repository at this point in the history
This reverts commit 820927c.

Broke the native build: 820927c#commitcomment-31529024
  • Loading branch information
Mic92 committed Dec 2, 2018
1 parent 51fbb39 commit 713f5e2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/tools/filesystems/btrfs-progs/default.nix
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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
Expand Down

0 comments on commit 713f5e2

Please sign in to comment.