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

btrfs-progs: fix on cross compilation

Browse Source 
Fixes #50925

(cherry picked from commit 04978d152e8e8e0c2f82cbb8c2addc4ecc93c79c)
This commit is contained in:
Matthew Bauer 2018-11-26 17:13:41 -06:00
parent 7a2c07d29b
commit 820927cb2c
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, python3, python3Packages , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python, pythonPackages
}: }:
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 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 # 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