ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

libgudev: dont specialcase cross and pull patch

Browse Source 
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
This commit is contained in:
Artturin 2022-07-07 21:31:52 +03:00
parent c5d7fc0b3c
commit 28ca82a86b
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/libgudev/default.nix
View File

@ -7,8 +7,8 @@
, glib , glib
, gnome , gnome
, vala , vala
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
, gobject-introspection , gobject-introspection
, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,6 +22,25 @@ stdenv.mkDerivation rec {
sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; 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; strictDeps = true;
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];
@ -32,7 +51,6 @@ stdenv.mkDerivation rec {
ninja ninja
vala vala
glib # for glib-mkenums needed during the build glib # for glib-mkenums needed during the build
] ++ lib.optionals withIntrospection [
gobject-introspection gobject-introspection
]; ];
@ -44,9 +62,6 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
# There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway
"-Dtests=disabled" "-Dtests=disabled"
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dvapi=disabled"
]; ];
passthru = { passthru = {