diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-13 11:47:33 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-13 18:36:44 +0800 |
| commit | 84d4523405486ae3e1cdb3c5ce61baf009fe79bd (patch) | |
| tree | 9685af8594ed3ab6818a25770af4577bdef0d67e /pkgs/desktops/pantheon/apps | |
| parent | 56be002ac5d9f2282105cb59494613e6b746cefb (diff) | |
| download | nixpkgs-84d4523405486ae3e1cdb3c5ce61baf009fe79bd.tar nixpkgs-84d4523405486ae3e1cdb3c5ce61baf009fe79bd.tar.gz nixpkgs-84d4523405486ae3e1cdb3c5ce61baf009fe79bd.tar.bz2 nixpkgs-84d4523405486ae3e1cdb3c5ce61baf009fe79bd.tar.lz nixpkgs-84d4523405486ae3e1cdb3c5ce61baf009fe79bd.tar.xz nixpkgs-84d4523405486ae3e1cdb3c5ce61baf009fe79bd.tar.zst nixpkgs-84d4523405486ae3e1cdb3c5ce61baf009fe79bd.zip | |
pantheon.elementary-camera: pull upstream fix for meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
Diffstat (limited to 'pkgs/desktops/pantheon/apps')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 932b54e82b6..7135795914d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/camera/pull/216 + (fetchpatch { + url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch"; + sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils |