diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-10-23 11:05:51 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2021-10-23 19:21:53 +0800 |
| commit | f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f (patch) | |
| tree | 66b94ea0be52d39b77b901b63d7c6887e62a7967 /pkgs/desktops/pantheon/apps/elementary-photos/default.nix | |
| parent | 34ad3ffe08adfca17fcb4e4a47bb5f3b113687be (diff) | |
| download | nixpkgs-f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f.tar nixpkgs-f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f.tar.gz nixpkgs-f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f.tar.bz2 nixpkgs-f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f.tar.lz nixpkgs-f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f.tar.xz nixpkgs-f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f.tar.zst nixpkgs-f71d3ea520cdc91c3fa61c8b37bdd5f7e762c45f.zip | |
pantheon.elementary-photos: fix build with vala 0.54
Diffstat (limited to 'pkgs/desktops/pantheon/apps/elementary-photos/default.nix')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 61ec86dec44..efd59f6ca0f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,11 +1,12 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson , ninja , pkg-config -, vala_0_52 +, vala , desktop-file-utils , gtk3 , libaccounts-glib @@ -45,11 +46,14 @@ stdenv.mkDerivation rec { sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + # Fix build with vala 0.54 + # https://github.com/elementary/photos/pull/650 + (fetchpatch { + url = "https://github.com/elementary/photos/commit/bc7feca8caa4c8fc076a759a2d36e26e93c75596.patch"; + sha256 = "sha256-iOHYKV7rSAuMm4ZhoJWjlpu96zlxwTosQe+z/iEVFR8="; + }) + ]; nativeBuildInputs = [ appstream @@ -58,9 +62,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - # Does not build with vala 0.54 - # https://github.com/elementary/photos/issues/638 - vala_0_52 + vala wrapGAppsHook ]; @@ -100,6 +102,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Photo viewer and organizer designed for elementary OS"; homepage = "https://github.com/elementary/photos"; |