alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

talloc: fix cross-compilation to 32-bit platforms

Browse source
This commit is contained in:
Ben Wolsieffer 2020-10-02 13:22:35 -04:00 committed by Frederik Rietdijk
parent 11806b6ede
commit 6501d9880c
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/libraries/talloc/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv
, fetchurl
, python
, python3
, pkg-config
, readline
, libxslt
@ -10,7 +10,7 @@
, wafHook
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
pname = "talloc";
version = "2.3.1";
@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
fixDarwinDylibNames
python
python3
wafHook
docbook-xsl-nons
docbook_xml_dtd_42
];
buildInputs = [
python3
readline
libxslt
];
@ -56,4 +57,9 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
platforms = platforms.all;
};
}
} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
# python-config from build Python gives incorrect values when cross-compiling.
# If python-config is not found, the build falls back to using the sysconfig
# module, which works correctly when cross-compiling.
PYTHON_CONFIG = "/invalid";
})

4
pkgs/top-level/all-packages.nix
View file

@ -15949,9 +15949,7 @@ in
taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
talloc = callPackage ../development/libraries/talloc {
python = buildPackages.python3;
};
talloc = callPackage ../development/libraries/talloc { };
tclap = callPackage ../development/libraries/tclap {};