diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-10-02 03:40:17 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-10-09 21:35:55 +0200 |
| commit | e50d5470e134b406d8c2f7e1843b8945c3786211 (patch) | |
| tree | 74c2dfa0a4b63fbc8eca86f7b9793f2f6880168a /pkgs/os-specific/linux/bolt | |
| parent | 36a7b1ee2e728a0ed9b587de1cc2bc2724719cb8 (diff) | |
| download | nixpkgs-e50d5470e134b406d8c2f7e1843b8945c3786211.tar nixpkgs-e50d5470e134b406d8c2f7e1843b8945c3786211.tar.gz nixpkgs-e50d5470e134b406d8c2f7e1843b8945c3786211.tar.bz2 nixpkgs-e50d5470e134b406d8c2f7e1843b8945c3786211.tar.lz nixpkgs-e50d5470e134b406d8c2f7e1843b8945c3786211.tar.xz nixpkgs-e50d5470e134b406d8c2f7e1843b8945c3786211.tar.zst nixpkgs-e50d5470e134b406d8c2f7e1843b8945c3786211.zip | |
bolt: fix tests
Newer umockdev pre-creates directories which leads to conflicts when the testsuite tries to create them as well.
Diffstat (limited to 'pkgs/os-specific/linux/bolt')
| -rw-r--r-- | pkgs/os-specific/linux/bolt/default.nix | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d38a97387f5..dd9436d9b0e 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -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 ''; |