b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bolt: fix tests

Browse source 
Newer umockdev pre-creates directories which leads to conflicts when the testsuite tries to create them as well.
This commit is contained in:
Jan Tojnar 2021-10-02 03:40:17 +02:00
parent 36a7b1ee2e
commit e50d5470e1
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/os-specific/linux/bolt/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ stdenv
, lib
, meson
, ninja
, pkg-config
@ -30,6 +31,25 @@ stdenv.mkDerivation rec {
sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm";
};
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";
})
# Fix tests with newer umockdev
(fetchpatch {
url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/130e09d1c7ff02c09e4ad1c9c36e9940b68e58d8.patch";
sha256 = "HycuM7z4VvtBuZZLU68tBxGT1YjaqJRS4sKyoTGHZEk=";
})
];
nativeBuildInputs = [
asciidoc
docbook_xml_dtd_45
@ -61,19 +81,6 @@ stdenv.mkDerivation rec {
(p: [ p.pygobject3 p.dbus-python p.python-dbusmock ]))
];
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
'';