public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "btrfs-progs: fix on cross compilation"

Browse Source 
This reverts commit 820927cb2c2ccb5bd9a938337228ea9c78400b49.

Broke the native build: 820927cb2c (commitcomment-31529024)
This commit is contained in:
Jörg Thalheim 2018-12-02 23:30:27 +00:00
parent 51fbb395cc
commit 713f5e270b
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/filesystems/btrfs-progs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo { 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 { stdenv.mkDerivation rec {
@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ 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 # gcc bug with -O1 on ARM with gcc 4.8
# This should be fine on all platforms so apply universally # This should be fine on all platforms so apply universally