aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/os-specific/linux/bolt/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/os-specific/linux/bolt/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/bolt/default.nix60
1 files changed, 47 insertions, 13 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/bolt/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/bolt/default.nix
index 114a90129ac2..1508125695e7 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/bolt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/bolt/default.nix
@@ -1,28 +1,50 @@
-{ stdenv, meson, ninja, pkgconfig, fetchFromGitLab,
- python3, umockdev, gobject-introspection, dbus,
- asciidoc, libxml2, libxslt, docbook_xml_dtd_45, docbook_xsl,
- glib, systemd, polkit
+{ stdenv
+, meson
+, ninja
+, pkgconfig
+, fetchFromGitLab
+, fetchpatch
+, python3
+, umockdev
+, gobject-introspection
+, dbus
+, asciidoc
+, libxml2
+, libxslt
+, docbook_xml_dtd_45
+, docbook_xsl
+, glib
+, systemd
+, polkit
}:
stdenv.mkDerivation rec {
pname = "bolt";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "bolt";
repo = "bolt";
rev = version;
- sha256 = "1qamls0fll0qc27lqavf56hv1yj6v6n4ry90g7bcnwpvccmd82yd";
+ sha256 = "sha256-lcJE+bMK2S2GObHMy/Fu12WGb3T1HrWjsNyZPz4/f4E=";
};
nativeBuildInputs = [
- meson ninja pkgconfig
- asciidoc libxml2 libxslt docbook_xml_dtd_45 docbook_xsl
+ asciidoc
+ docbook_xml_dtd_45
+ docbook_xsl
+ libxml2
+ libxslt
+ meson
+ ninja
+ pkgconfig
] ++ stdenv.lib.optional (!doCheck) python3;
buildInputs = [
- glib systemd polkit
+ glib
+ polkit
+ systemd
];
doCheck = true;
@@ -32,13 +54,25 @@ stdenv.mkDerivation rec {
'';
checkInputs = [
- dbus umockdev gobject-introspection
+ dbus
+ gobject-introspection
+ umockdev
(python3.withPackages
(p: [ p.pygobject3 p.dbus-python p.python-dbusmock ]))
];
- # meson install tries to create /var/lib/boltd
- patches = [ ./0001-skip-mkdir.patch ];
+ patches = [
+ # meson install tries to create /var/lib/boltd
+ ./0001-skip-mkdir.patch
+
+ # https://github.com/NixOS/nixpkgs/issues/104429
+ # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167
+ (fetchpatch {
+ name = "disable-atime-tests.diff";
+ url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff";
+ sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8";
+ })
+ ];
postPatch = ''
patchShebangs scripts tests
@@ -55,7 +89,7 @@ stdenv.mkDerivation rec {
description = "Thunderbolt 3 device management daemon";
homepage = "https://gitlab.freedesktop.org/bolt/bolt";
license = licenses.lgpl21Plus;
- maintainers = [ maintainers.callahad ];
+ maintainers = with maintainers; [ callahad ];
platforms = platforms.linux;
};
}