public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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 { stdenv
, fetchurl , fetchurl
, python , python3
, pkg-config , pkg-config
, readline , readline
, libxslt , libxslt
@ -10,7 +10,7 @@
, wafHook , wafHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
pname = "talloc"; pname = "talloc";
version = "2.3.1"; version = "2.3.1";
@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
fixDarwinDylibNames fixDarwinDylibNames
python python3
wafHook wafHook
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_42 docbook_xml_dtd_42
]; ];
buildInputs = [ buildInputs = [
python3
readline readline
libxslt libxslt
]; ];
@ -56,4 +57,9 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.all; 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 { }; taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
talloc = callPackage ../development/libraries/talloc { talloc = callPackage ../development/libraries/talloc { };
python = buildPackages.python3;
};
tclap = callPackage ../development/libraries/tclap {}; tclap = callPackage ../development/libraries/tclap {};