diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-07 12:19:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 12:19:52 +0000 |
| commit | eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6 (patch) | |
| tree | b987f13ca2106c973517f7ef65758ef21d4fafd0 /pkgs/os-specific/linux | |
| parent | cc5dccaa919bff16db697ca7631a49a5daadb513 (diff) | |
| parent | f8b24938bf73dafe78433a69d4d404dafec628ae (diff) | |
| download | nixpkgs-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar nixpkgs-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.gz nixpkgs-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.bz2 nixpkgs-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.lz nixpkgs-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.xz nixpkgs-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.zst nixpkgs-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -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 |