Skip to content

Commit

Permalink
btrfs-progs: fix cross
Browse files Browse the repository at this point in the history
  • Loading branch information
globin committed May 7, 2019
1 parent 5fd31ae commit 5448f6c
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions 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, python3, python3Packages
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3
}:

stdenv.mkDerivation rec {
Expand All @@ -12,10 +12,17 @@ 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
python3 python3.pkgs.setuptools
];

buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];
buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python3 ];

# for python cross-compiling
_PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config;
postConfigure = ''
export LDSHARED="$LD -shared"
'';

# gcc bug with -O1 on ARM with gcc 4.8
# This should be fine on all platforms so apply universally
Expand Down

2 comments on commit 5448f6c

@vcunat
Copy link
Member

@vcunat vcunat commented on 5448f6c May 30, 2019

Choose a reason for hiding this comment

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

This commit broke pkgsi686Linux.btrfs-progs build and consequently is blocking nixos-unstable and nixpkgs-unstable channels ATM.

@vcunat
Copy link
Member

@vcunat vcunat commented on 5448f6c May 30, 2019

Choose a reason for hiding this comment

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

I pushed a minimalist hack for now: aa440d8.

Please sign in to comment.