From 8044c6960ae236d1aa578ea9a8361cf4652958c1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Mar 2022 16:39:28 +0800 Subject: pika-backup: fix build with meson 0.61 --- pkgs/applications/backup/pika-backup/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index e0b8b2fca14f..251470a27d8b 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 = '' -- cgit 1.4.1 From eff2f9e5284d0b8374eb79c677913818d24e8764 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Mar 2022 17:06:50 +0800 Subject: pika-backup: set meta.platforms zbus is linux-specific in 1.9.1 so we restrict the platforms. --- pkgs/applications/backup/pika-backup/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 251470a27d8b..604456c6583a 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -81,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; }; } -- cgit 1.4.1