|
|
|
@ -1,12 +1,11 @@ |
|
|
|
|
{ lib, stdenv |
|
|
|
|
, fetchFromGitHub |
|
|
|
|
, fetchpatch |
|
|
|
|
, nix-update-script |
|
|
|
|
, pantheon |
|
|
|
|
, meson |
|
|
|
|
, ninja |
|
|
|
|
, pkg-config |
|
|
|
|
, vala |
|
|
|
|
, vala_0_52 |
|
|
|
|
, desktop-file-utils |
|
|
|
|
, gtk3 |
|
|
|
|
, libaccounts-glib |
|
|
|
@ -35,7 +34,7 @@ |
|
|
|
|
|
|
|
|
|
stdenv.mkDerivation rec { |
|
|
|
|
pname = "elementary-photos"; |
|
|
|
|
version = "2.7.1"; |
|
|
|
|
version = "2.7.2"; |
|
|
|
|
|
|
|
|
|
repoName = "photos"; |
|
|
|
|
|
|
|
|
@ -43,18 +42,9 @@ stdenv.mkDerivation rec { |
|
|
|
|
owner = "elementary"; |
|
|
|
|
repo = repoName; |
|
|
|
|
rev = version; |
|
|
|
|
sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p"; |
|
|
|
|
sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
patches = [ |
|
|
|
|
# Upstream code not respecting our localedir |
|
|
|
|
# https://github.com/elementary/photos/pull/629 |
|
|
|
|
(fetchpatch { |
|
|
|
|
url = "https://github.com/elementary/photos/commit/e5230a4305381734e93f1e3d1177da21a8a4121b.patch"; |
|
|
|
|
sha256 = "1igqq51sj1sx6rl8yrw037jsgnaxfwzfs0m6pqzb9q4jvfdimzfi"; |
|
|
|
|
}) |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
passthru = { |
|
|
|
|
updateScript = nix-update-script { |
|
|
|
|
attrPath = "pantheon.${pname}"; |
|
|
|
@ -68,7 +58,9 @@ stdenv.mkDerivation rec { |
|
|
|
|
ninja |
|
|
|
|
pkg-config |
|
|
|
|
python3 |
|
|
|
|
vala |
|
|
|
|
# Does not build with vala 0.54 |
|
|
|
|
# https://github.com/elementary/photos/issues/638 |
|
|
|
|
vala_0_52 |
|
|
|
|
wrapGAppsHook |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|