Skip to content

Commit

Permalink
bolt: 0.9.7 -> 0.9.8 (NixOS#366006)
Browse files Browse the repository at this point in the history
  • Loading branch information
philiptaron authored Dec 19, 2024
2 parents cd47d56 + 2ea22a2 commit 2dc1546
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 22 deletions.
12 changes: 0 additions & 12 deletions pkgs/by-name/bo/bolt/0001-skip-mkdir.patch

This file was deleted.

14 changes: 4 additions & 10 deletions pkgs/by-name/bo/bolt/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,23 @@

stdenv.mkDerivation rec {
pname = "bolt";
version = "0.9.7";
version = "0.9.8";

src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "bolt";
repo = "bolt";
rev = version;
sha256 = "sha256-6m4Yrev9W5WV4/pptc8tJ4hc6QSC+eJ7BSt2mx33s9U=";
hash = "sha256-sDPipSIT2MJMdsOjOQSB+uOe6KXzVnyAqcQxPPr2NsU=";
};

patches = [
# meson install tries to create /var/lib/boltd
./0001-skip-mkdir.patch

# Test does not work on ZFS with atime disabled.
# Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167
(fetchpatch {
url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/c2f1d5c40ad71b20507e02faa11037b395fac2f8.diff";
revert = true;
sha256 = "6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I=";
hash = "sha256-6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I=";
})
];

Expand All @@ -59,16 +56,13 @@ stdenv.mkDerivation rec {
ninja
pkg-config
glib
] ++ lib.optional (!doCheck) python3;
];

buildInputs = [
polkit
systemd
];

# https://gitlab.freedesktop.org/bolt/bolt/-/issues/181
doCheck = false;

preCheck = ''
export LD_LIBRARY_PATH=${umockdev.out}/lib/
'';
Expand Down

0 comments on commit 2dc1546

Please sign in to comment.