From 28ca82a86bbead53b1a5724bbb96a6dc88dfbde3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 7 Jul 2022 21:31:52 +0300 Subject: [PATCH] libgudev: dont specialcase cross and pull patch to not have to have vala in both nativeBuildInputs and buildInputs https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/27 > build: let meson handle gir, vala, gtk-doc dependencies > gnome.generate_gir > gnome.generate_vapi > gnome.gtkdoc > > all do their own dependency finding in a cross-compilation friendly manner while > using dependency() with the default options does not > > fixes finding vapigen while cross-compiling --- .../libraries/libgudev/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 6a63947c8a57..59df64e63558 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -7,8 +7,8 @@ , glib , gnome , vala -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) , gobject-introspection +, fetchpatch }: stdenv.mkDerivation rec { @@ -22,6 +22,25 @@ stdenv.mkDerivation rec { sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; }; + patches = [ + # https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/27 + (fetchpatch { + name = "gir-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/6bdde16a0cfde462502fce1d9a7eb6ec33f388bb.diff"; + sha256 = "sha256-bDtLUxOLEgyJURshqEQC4YCBTUVzQQP4qoWL786b3Z8="; + }) + (fetchpatch { + name = "vapi-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/d1f6457910842ba869c9871e7a2131fbe0d6b6be.diff"; + sha256 = "sha256-/PY8ziZST/vQvksJm69a3O6/YesknIxCDvj0z40piik="; + }) + (fetchpatch { + name = "gtk-doc-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/34336cbadbcaac8b9b029f730eed0bdf4c633617.diff"; + sha256 = "sha256-Bk05xe69LGqWH1uhLMZhwbVMSsCTyBrrOvqWic2TTd4="; + }) + ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -32,7 +51,6 @@ stdenv.mkDerivation rec { ninja vala glib # for glib-mkenums needed during the build - ] ++ lib.optionals withIntrospection [ gobject-introspection ]; @@ -44,9 +62,6 @@ stdenv.mkDerivation rec { mesonFlags = [ # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway "-Dtests=disabled" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dvapi=disabled" ]; passthru = {