summary refs log tree commit diff
path: root/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-01-29 19:01:43 -0500
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-01-29 19:37:43 -0500
commit29ae094829fda5c329686e07bf29f377fefd32b0 (patch)
tree16b251a90271989ec985ca3bd4231d40fed4ecd7 /pkgs/desktops/pantheon/apps/elementary-photos/default.nix
parent50b83e7b6a851a2daadf100e04ac924f3f01cb09 (diff)
downloadnixpkgs-29ae094829fda5c329686e07bf29f377fefd32b0.tar
nixpkgs-29ae094829fda5c329686e07bf29f377fefd32b0.tar.gz
nixpkgs-29ae094829fda5c329686e07bf29f377fefd32b0.tar.bz2
nixpkgs-29ae094829fda5c329686e07bf29f377fefd32b0.tar.lz
nixpkgs-29ae094829fda5c329686e07bf29f377fefd32b0.tar.xz
nixpkgs-29ae094829fda5c329686e07bf29f377fefd32b0.tar.zst
nixpkgs-29ae094829fda5c329686e07bf29f377fefd32b0.zip
pantheon.elementary-photos: 2.6.1 -> 2.6.2
Diffstat (limited to 'pkgs/desktops/pantheon/apps/elementary-photos/default.nix')
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-photos/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 055889fd6d1..21d5b9f1db4 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils
 , gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2
-, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite
+, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3
 , scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }:
 
 stdenv.mkDerivation rec {
   pname = "photos";
-  version = "2.6.1";
+  version = "2.6.2";
 
   name = "elementary-${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "063h6jr0p8v46w8bppsss1zlphx21xqwylh57qbyd5xi71z4gl1v";
+    sha256 = "166a1jb85n67z6ffm5i0xzap407rv0r511lzh0gidkap1qy6pnmi";
   };
 
   passthru = {
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkgconfig
+    python3
     vala
     wrapGAppsHook
   ];
@@ -65,9 +66,9 @@ stdenv.mkDerivation rec {
     "-Dplugins=false"
   ];
 
-  # This should be provided by a post_install.py script - See -> https://github.com/elementary/photos/pull/433
-  postInstall = ''
-    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
   '';
 
   meta =  with stdenv.lib; {