cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gdk-pixbuf: enable strictDeps

Browse source 
gdk-pixbuf: make gobject-introspection conditional to fix binfmt cross-compile
This commit is contained in:
Artturin 2021-10-23 02:41:34 +03:00
parent 0a5f2516bc
commit bf05ab56cf
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/libraries/gdk-pixbuf/default.nix
View file

@ -16,10 +16,11 @@
, libjpeg , libjpeg
, libpng , libpng
, gnome , gnome
, gobject-introspection
, doCheck ? false , doCheck ? false
, makeWrapper , makeWrapper
, lib , lib
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
, gobject-introspection
}: }:
let let
@ -43,13 +44,19 @@ stdenv.mkDerivation rec {
./installed-tests-path.patch ./installed-tests-path.patch
]; ];
# gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pkg-config pkg-config
gettext gettext
python3 python3
gobject-introspection
makeWrapper makeWrapper
glib glib
gi-docgen gi-docgen
@ -58,7 +65,11 @@ stdenv.mkDerivation rec {
libxslt libxslt
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_43 docbook_xml_dtd_43
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; ] ++ lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
] ++ lib.optionals withIntrospection [
gobject-introspection
];
propagatedBuildInputs = [ propagatedBuildInputs = [
glib glib
@ -69,7 +80,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=${lib.boolToString withGtkDoc}" "-Dgtk_doc=${lib.boolToString withGtkDoc}"
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
"-Dgio_sniffing=false" "-Dgio_sniffing=false"
]; ];