Improve conditional guarding gi fix (#977)
commitdcecae2365af1c3e3fbc7c3e84fc8515901c12e7
authorHamish Mackenzie <Hamish.Mackenzie@iohk.io>
dateFri 18 Dec 2020, 19:23 (6 years ago)
parent93e7e37
overlays/gobject-introspection.nix+3−3
@@ -2,8 +2,8 @@
22final: prev: {
33 # As of nixpkgs 20.09 harfbuzz is built with mesonFlags and hopefully includes
44 # gobject introspection correctly. Older nixpkgs will have configureFlags to update.
5− harfbuzz = prev.harfbuzz.overrideAttrs (attr: final.lib.optionalAttrs (attr ? configureFlags) {
6− configureFlags = attr.configureFlags ++ [ "--enable-introspection=yes" "--with-gobject=yes" ];
7− buildInputs = attr.buildInputs ++ [ final.pkgs.gobject-introspection ];
5+ harfbuzz = prev.harfbuzz.overrideAttrs (attr: final.lib.optionalAttrs (final.lib.versionOlder final.lib.trivial.release "20.09") {
6+ configureFlags = attr.configureFlags or [] ++ [ "--enable-introspection=yes" "--with-gobject=yes" ];
7+ buildInputs = attr.buildInputs or [] ++ [ final.pkgs.gobject-introspection ];
88 });
99}