summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-07-21 12:02:01 +0800
committerBobby Rong <rjl931189261@126.com>2021-09-18 19:33:38 +0800
commit91073bc810e1606a116b96c4f59c57ad7c2777f0 (patch)
treee46af8c055d07d2ff9871e4fb822c34f94398b02 /pkgs/desktops
parent3da8bb4e3a8836ca53396f52ac92998992a476e2 (diff)
downloadnixpkgs-91073bc810e1606a116b96c4f59c57ad7c2777f0.tar
nixpkgs-91073bc810e1606a116b96c4f59c57ad7c2777f0.tar.gz
nixpkgs-91073bc810e1606a116b96c4f59c57ad7c2777f0.tar.bz2
nixpkgs-91073bc810e1606a116b96c4f59c57ad7c2777f0.tar.lz
nixpkgs-91073bc810e1606a116b96c4f59c57ad7c2777f0.tar.xz
nixpkgs-91073bc810e1606a116b96c4f59c57ad7c2777f0.tar.zst
nixpkgs-91073bc810e1606a116b96c4f59c57ad7c2777f0.zip
pantheon.elementary-screenshot: 1.7.1 -> 6.0.0
renamed from pantheon.elementary-screenshot-tool
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix (renamed from pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix)8
-rw-r--r--pkgs/desktops/pantheon/default.nix4
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index 048aa4ab129..a7f2489da45 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -11,14 +11,15 @@
 , gtk3
 , granite
 , libgee
+, libhandy
 , libcanberra
 , elementary-icon-theme
 , wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
-  pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
-  version = "1.7.1";
+  pname = "elementary-screenshot";
+  version = "6.0.0";
 
   repoName = "screenshot";
 
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "sha256-qo55fzp0ieYF5I5uxnCQY066mege06InHL3B3ahYMZ0=";
+    sha256 = "1fvsl9zdkv7bgx3jpy7pr9lflm4ckr3swdby379mdxn2x6kxji0x";
   };
 
   passthru = {
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
     gtk3
     libcanberra
     libgee
+    libhandy
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index db740468ea7..fb3af650641 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -59,7 +59,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   elementary-photos = callPackage ./apps/elementary-photos { };
 
-  elementary-screenshot-tool = callPackage ./apps/elementary-screenshot-tool { };
+  elementary-screenshot = callPackage ./apps/elementary-screenshot { };
 
   elementary-tasks = callPackage ./apps/elementary-tasks { };
 
@@ -207,4 +207,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";
 
+  elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21
+
 })