diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libgudev/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libgudev/default.nix | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 59df64e63558..5098bd9f65ca 100644 --- a/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , pkg-config , meson @@ -9,42 +10,23 @@ , vala , gobject-introspection , fetchpatch +, glibcLocales +, umockdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgudev"; - version = "237"; + version = "238"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; + url = "mirror://gnome/sources/libgudev/${lib.versions.majorMinor finalAttrs.version}/libgudev-${finalAttrs.version}.tar.xz"; + hash = "sha256-YSZqsa/J1z28YKiyr3PpnS/f9H2ZVE0IV2Dk+mZ7XdE="; }; - 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 ]; - nativeBuildInputs = [ pkg-config meson @@ -59,14 +41,17 @@ stdenv.mkDerivation rec { glib ]; - mesonFlags = [ - # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway - "-Dtests=disabled" + checkInputs = [ + glibcLocales + umockdev ]; + doCheck = true; + mesonFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-Dtests=disabled"; + passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgudev"; versionPolicy = "none"; }; }; @@ -78,4 +63,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl2Plus; }; -} +}) |