forked from mirrors/nixpkgs
glib: fix cross-compiling
This commit is contained in:
parent
7f5d920bc5
commit
884a83cacb
|
@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
libelf setupHook pcre
|
||||
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
|
||||
gtk-doc
|
||||
] ++ optionals stdenv.isLinux [
|
||||
libselinux
|
||||
util-linuxMinimal # for libmount
|
||||
|
@ -99,8 +100,10 @@ stdenv.mkDerivation rec {
|
|||
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
|
||||
]);
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
|
||||
meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ zlib libffi gettext libiconv ];
|
||||
|
@ -144,7 +147,7 @@ stdenv.mkDerivation rec {
|
|||
cp -r ${buildPackages.glib.devdoc} $devdoc
|
||||
'';
|
||||
|
||||
checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
|
||||
checkInputs = [ tzdata desktop-file-utils shared-mime-info ];
|
||||
|
||||
preCheck = optionalString doCheck ''
|
||||
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
|
|
Loading…
Reference in a new issue