diff options
| author | Robin Gloster <mail@glob.in> | 2019-05-07 00:52:54 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-05-07 18:14:12 +0200 |
| commit | 5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86 (patch) | |
| tree | 88eb516c73d9dc75f52aa82b96e56b3dc9f07215 /pkgs/tools/filesystems/btrfs-progs | |
| parent | 5fd31ae88648a819ba302ce8a63627bd931afaaa (diff) | |
| download | nixpkgs-5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86.tar nixpkgs-5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86.tar.gz nixpkgs-5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86.tar.bz2 nixpkgs-5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86.tar.lz nixpkgs-5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86.tar.xz nixpkgs-5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86.tar.zst nixpkgs-5448f6c558bb6a1a2f3da3e1a170f53eae0a2f86.zip | |
btrfs-progs: fix cross
Diffstat (limited to 'pkgs/tools/filesystems/btrfs-progs')
| -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 ebb9db8670e..47906389d58 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 |