diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-02-24 10:31:18 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2021-02-24 12:14:35 +0100 |
| commit | 884a83cacb6907063e827ad589a68bb622c84394 (patch) | |
| tree | 2c4a625e854e623532643773976ee69dac7f81d0 /pkgs/development/libraries/glib | |
| parent | 7f5d920bc548485d87bb480f7f5367acdaae52b7 (diff) | |
| download | nixpkgs-884a83cacb6907063e827ad589a68bb622c84394.tar nixpkgs-884a83cacb6907063e827ad589a68bb622c84394.tar.gz nixpkgs-884a83cacb6907063e827ad589a68bb622c84394.tar.bz2 nixpkgs-884a83cacb6907063e827ad589a68bb622c84394.tar.lz nixpkgs-884a83cacb6907063e827ad589a68bb622c84394.tar.xz nixpkgs-884a83cacb6907063e827ad589a68bb622c84394.tar.zst nixpkgs-884a83cacb6907063e827ad589a68bb622c84394.zip | |
glib: fix cross-compiling
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 0e8ed605a2d..abf880c1994 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -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" |