diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-18 11:56:40 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-18 11:56:40 -0400 |
| commit | 75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad (patch) | |
| tree | 8802cbe0f43f009f5a44814da021684fb8879e7c /pkgs/desktops/pantheon/apps | |
| parent | 26463d07368df63a638e6f5ad63fd0e663c5b8f1 (diff) | |
| download | nixpkgs-75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad.tar nixpkgs-75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad.tar.gz nixpkgs-75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad.tar.bz2 nixpkgs-75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad.tar.lz nixpkgs-75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad.tar.xz nixpkgs-75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad.tar.zst nixpkgs-75cc84b3b7f8c14c35e6a5973d65f504ab29b8ad.zip | |
pantheon.elementary-photos: fix issue introduced in elementary/photos#498
Diffstat (limited to 'pkgs/desktops/pantheon/apps')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch | 21 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index dab6407fd82..493e7a97805 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -66,6 +66,12 @@ stdenv.mkDerivation rec { "-Dplugins=false" ]; + patches = [ + # https://github.com/elementary/photos/pull/505 + # Unrelated line got dropped in https://github.com/elementary/photos/pull/498 + ./fix-missing-line.patch + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch b/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch new file mode 100644 index 00000000000..ae859d9dff9 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch @@ -0,0 +1,21 @@ +From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001 +From: Fabio Valentini <decathorpe@gmail.com> +Date: Tue, 16 Apr 2019 16:12:47 +0200 +Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498 + +--- + src/photos/PhotoMetadata.vala | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala +index f0a4a73b..34dcbb55 100644 +--- a/src/photos/PhotoMetadata.vala ++++ b/src/photos/PhotoMetadata.vala +@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata { + #else + exiv2.from_app1_segment (buffer, length); + #endif ++ exif = Exif.Data.new_from_data (buffer, length); + source_name = "<app1 segment %d bytes>".printf (length); + } + |