Skip to content

Commit

Permalink
btrfs-progs: fix on cross compilation
Browse files Browse the repository at this point in the history 
Fixes #50925

(cherry picked from commit 04978d152e8e8e0c2f82cbb8c2addc4ecc93c79c)
  • Loading branch information
@matthewbauer
matthewbauer committed Dec 2, 2018
1 parent 7a2c07d commit 820927c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/tools/filesystems/btrfs-progs/default.nix
View file
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, python3, python3Packages
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python, pythonPackages
}:

stdenv.mkDerivation rec {
Expand All @@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
};

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
# This should be fine on all platforms so apply universally
Expand Down

4 comments on commit 820927c

@pbogdan
Copy link
Member

@pbogdan pbogdan commented on 820927c Dec 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to break non-cross build for me:

checking for backtrace_symbols_fd... yes
checking for xmlto... /nix/store/rly78n21fvbg5scqw2jnhj8kxhcsnymp-xmlto-0.0.28/bin/xmlto
checking for mv... /nix/store/6ijcqj11spx36kk2fc9s8jkfdjp7vy7g-coreutils-8.30/bin/mv
checking for a sed that does not truncate output... /nix/store/4lw2yc36b5r9d6mq5ha89w8j57h550y6-gnused-4.5/bin/sed
checking for asciidoc... /nix/store/62g4ck00ff8xykwm9i7iz07f2d3vddvg-asciidoc-8.6.9/bin/asciidoc
checking for asciidoctor... no
checking for ext2fs... yes
checking for com_err... yes
checking for reiserfscore >= 3.6.27... no
checking for FIEMAP_EXTENT_SHARED defined in linux/fiemap.h... yes
checking for blkid... yes
checking for uuid... yes
checking for zlib... yes
checking for libzstd >= 1.0.0... yes
checking for a Python interpreter with version >= 3.4... none
configure: error: no suitable Python interpreter found
builder for '/nix/store/vwwag65vr3q905bdg0cyal8lfnmp5avq-btrfs-progs-4.19.drv' failed with exit code 1
error: build of '/nix/store/vwwag65vr3q905bdg0cyal8lfnmp5avq-btrfs-progs-4.19.drv' failed

@pbogdan
Copy link
Member

@pbogdan pbogdan commented on 820927c Dec 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Incidentally even with this commit applied a cross build fails in the exact same way...

@Mic92
Copy link
Member

@Mic92 Mic92 commented on 820927c Dec 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted in 713f5e2

@matthewbauer
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! That was not supposed to be merged.

Please sign in to comment.