Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

gdk-pixbuf: enable strictDeps

gdk-pixbuf: make gobject-introspection conditional to fix binfmt cross-compile

Artturin bf05ab56 0a5f2516

+15 -4
+15 -4
pkgs/development/libraries/gdk-pixbuf/default.nix
··· 16 , libjpeg 17 , libpng 18 , gnome 19 - , gobject-introspection 20 , doCheck ? false 21 , makeWrapper 22 , lib 23 }: 24 25 let ··· 41 patches = [ 42 # Move installed tests to a separate output 43 ./installed-tests-path.patch 44 ]; 45 46 nativeBuildInputs = [ ··· 49 pkg-config 50 gettext 51 python3 52 - gobject-introspection 53 makeWrapper 54 glib 55 gi-docgen ··· 58 libxslt 59 docbook-xsl-nons 60 docbook_xml_dtd_43 61 - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; 62 63 propagatedBuildInputs = [ 64 glib ··· 69 70 mesonFlags = [ 71 "-Dgtk_doc=${lib.boolToString withGtkDoc}" 72 - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" 73 "-Dgio_sniffing=false" 74 ]; 75
··· 16 , libjpeg 17 , libpng 18 , gnome 19 , doCheck ? false 20 , makeWrapper 21 , lib 22 + , withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) 23 + , gobject-introspection 24 }: 25 26 let ··· 42 patches = [ 43 # Move installed tests to a separate output 44 ./installed-tests-path.patch 45 + ]; 46 + 47 + # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work 48 + strictDeps = true; 49 + 50 + depsBuildBuild = [ 51 + pkg-config 52 ]; 53 54 nativeBuildInputs = [ ··· 57 pkg-config 58 gettext 59 python3 60 makeWrapper 61 glib 62 gi-docgen ··· 65 libxslt 66 docbook-xsl-nons 67 docbook_xml_dtd_43 68 + ] ++ lib.optionals stdenv.isDarwin [ 69 + fixDarwinDylibNames 70 + ] ++ lib.optionals withIntrospection [ 71 + gobject-introspection 72 + ]; 73 74 propagatedBuildInputs = [ 75 glib ··· 80 81 mesonFlags = [ 82 "-Dgtk_doc=${lib.boolToString withGtkDoc}" 83 + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" 84 "-Dgio_sniffing=false" 85 ]; 86