bolt: 0.9.7 -> 0.9.8 (#366006)

This commit is contained in:
Philip Taron
2024-12-19 10:10:26 -08:00
committed by GitHub
2 changed files with 4 additions and 22 deletions

View File

@@ -1,12 +0,0 @@
diff --git a/scripts/meson-install.sh b/scripts/meson-install.sh
index 859ae81..05a1c58 100644
--- a/scripts/meson-install.sh
+++ b/scripts/meson-install.sh
@@ -7,5 +7,5 @@ fi
BOLT_DBDIR=$1
-echo "Creating database dir: ${BOLT_DBDIR}"
-mkdir -p "${DESTDIR}/${BOLT_DBDIR}"
+# echo "Creating database dir: ${BOLT_DBDIR}"
+# mkdir -p "${DESTDIR}/${BOLT_DBDIR}"

View File

@@ -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=";
})
];
@@ -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/
'';