diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-18 08:17:48 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-18 08:17:48 +0200 |
| commit | 840e530934eb24f83788bb0933e304500ea0dc01 (patch) | |
| tree | b330ddaaaa66808ffe137eef0f48ce080d08bda9 /pkgs/tools/filesystems | |
| parent | 365c82c4bb80585d827ecde76b105075aba94040 (diff) | |
| parent | 2de2bc4be10637a7d8b11d40731954034ae3be57 (diff) | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ebb9db8670e3..47906389d58b 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/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 { @@ -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 |