diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2020-12-06 23:56:11 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-12-07 08:44:08 +0100 |
| commit | 031dabe1ca26ffd1ca89c10b3188409b12326104 (patch) | |
| tree | 5f39304dce787d87aeb3a569bec24f306eb2040f /pkgs/os-specific/linux/bolt | |
| parent | 5bedea4ecf2360c78ced4b7c7cc02198b7287026 (diff) | |
| download | nixpkgs-031dabe1ca26ffd1ca89c10b3188409b12326104.tar nixpkgs-031dabe1ca26ffd1ca89c10b3188409b12326104.tar.gz nixpkgs-031dabe1ca26ffd1ca89c10b3188409b12326104.tar.bz2 nixpkgs-031dabe1ca26ffd1ca89c10b3188409b12326104.tar.lz nixpkgs-031dabe1ca26ffd1ca89c10b3188409b12326104.tar.xz nixpkgs-031dabe1ca26ffd1ca89c10b3188409b12326104.tar.zst nixpkgs-031dabe1ca26ffd1ca89c10b3188409b12326104.zip | |
bolt: Disable atime tests
Diffstat (limited to 'pkgs/os-specific/linux/bolt')
| -rw-r--r-- | pkgs/os-specific/linux/bolt/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 8bd442843b1..1508125695e 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -3,6 +3,7 @@ , ninja , pkgconfig , fetchFromGitLab +, fetchpatch , python3 , umockdev , gobject-introspection @@ -60,8 +61,18 @@ stdenv.mkDerivation rec { (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 |