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-04-11 18:34:37 -0400
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-04-11 18:34:37 -0400
commit69edf5196380eb01d5c83fe38084e00eca66a39f (patch)
treea552d774bbbca02465b83fead33ef1048c2ecd4e /pkgs/desktops/pantheon/apps/elementary-photos/default.nix
parentf5d208d754909c950305ed8f382e5b965395ace0 (diff)
downloadnixpkgs-69edf5196380eb01d5c83fe38084e00eca66a39f.tar
nixpkgs-69edf5196380eb01d5c83fe38084e00eca66a39f.tar.gz
nixpkgs-69edf5196380eb01d5c83fe38084e00eca66a39f.tar.bz2
nixpkgs-69edf5196380eb01d5c83fe38084e00eca66a39f.tar.lz
nixpkgs-69edf5196380eb01d5c83fe38084e00eca66a39f.tar.xz
nixpkgs-69edf5196380eb01d5c83fe38084e00eca66a39f.tar.zst
nixpkgs-69edf5196380eb01d5c83fe38084e00eca66a39f.zip
pantheon.elementary-photos: 2.6.2 -> 2.6.3
Drop gexiv2 0.12 patch, fix is upstream.

https://github.com/elementary/photos/releases/tag/2.6.3
Diffstat (limited to 'pkgs/desktops/pantheon/apps/elementary-photos/default.nix')
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-photos/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 644841354e5..dab6407fd82 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   pname = "photos";
-  version = "2.6.2";
+  version = "2.6.3";
 
   name = "elementary-${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "166a1jb85n67z6ffm5i0xzap407rv0r511lzh0gidkap1qy6pnmi";
+    sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg";
   };
 
   passthru = {
@@ -66,14 +66,6 @@ stdenv.mkDerivation rec {
     "-Dplugins=false"
   ];
 
-  patches = [
-    # Fix build against gexiv2 0.12
-    (fetchpatch {
-      url = "https://github.com/elementary/photos/commit/86df00ced674abb2ee430ea24422079cfabb314c.patch";
-      sha256 = "0836fzja93w36jf7ldqypsmnqn46mwsl93q41m104zn8qm0wrkmy";
-    })
-  ];
-
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py