about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-03-27 12:50:38 +0200
committerGitHub <noreply@github.com>2022-03-27 12:50:38 +0200
commitfe16115187b80f620f6b162c4d91b888a3fac9a3 (patch)
treebb0a33dcbc0988da47f41b09e25aa9da6fd4025f /pkgs
parent25d6fb865694e8c10467d8b2f5f49d8a4b6c2b4e (diff)
parenteff2f9e5284d0b8374eb79c677913818d24e8764 (diff)
downloadnixlib-fe16115187b80f620f6b162c4d91b888a3fac9a3.tar
nixlib-fe16115187b80f620f6b162c4d91b888a3fac9a3.tar.gz
nixlib-fe16115187b80f620f6b162c4d91b888a3fac9a3.tar.bz2
nixlib-fe16115187b80f620f6b162c4d91b888a3fac9a3.tar.lz
nixlib-fe16115187b80f620f6b162c4d91b888a3fac9a3.tar.xz
nixlib-fe16115187b80f620f6b162c4d91b888a3fac9a3.tar.zst
nixlib-fe16115187b80f620f6b162c4d91b888a3fac9a3.zip
Merge pull request #165580 from bobby285271/pika-backup
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/backup/pika-backup/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix
index e0b8b2fca14f..604456c6583a 100644
--- a/pkgs/applications/backup/pika-backup/default.nix
+++ b/pkgs/applications/backup/pika-backup/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, fetchpatch
 , rustPlatform
 , substituteAll
 , desktop-file-utils
@@ -40,6 +41,13 @@ stdenv.mkDerivation rec {
       src = ./borg-path.patch;
       borg = "${borgbackup}/bin/borg";
     })
+    # Fix build with meson 0.61, can be removed on next release.
+    # https://gitlab.gnome.org/World/pika-backup/-/issues/156
+    # https://github.com/mesonbuild/meson/issues/9441
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/World/pika-backup/-/commit/54be149c88fd69fb9e74b7362fe7182863237869.patch";
+      sha256 = "sha256-Tffxo5hlf/gSkp1GfyL4eHthX49tuTq6B+S53N8oA2M=";
+    })
   ];
 
   postPatch = ''
@@ -73,5 +81,6 @@ stdenv.mkDerivation rec {
     changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dotlambda ];
+    platforms = platforms.linux;
   };
 }