summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-10-16 12:15:24 +0800
committerBobby Rong <rjl931189261@126.com>2021-10-16 12:17:34 +0800
commit805b4e109b077ac14cd6b0c62213c09a627d5c3a (patch)
tree6cf134f811c9fa8bc51c6ad6df46cad44650f2ff /pkgs/applications/office
parentcb10e4ddf6d58987e2b2eb41b827984af27ee98e (diff)
downloadnixpkgs-805b4e109b077ac14cd6b0c62213c09a627d5c3a.tar
nixpkgs-805b4e109b077ac14cd6b0c62213c09a627d5c3a.tar.gz
nixpkgs-805b4e109b077ac14cd6b0c62213c09a627d5c3a.tar.bz2
nixpkgs-805b4e109b077ac14cd6b0c62213c09a627d5c3a.tar.lz
nixpkgs-805b4e109b077ac14cd6b0c62213c09a627d5c3a.tar.xz
nixpkgs-805b4e109b077ac14cd6b0c62213c09a627d5c3a.tar.zst
nixpkgs-805b4e109b077ac14cd6b0c62213c09a627d5c3a.zip
khronos: 3.5.9 -> 3.6.0
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/khronos/default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix
index b3a38905531..f319b419fbb 100644
--- a/pkgs/applications/office/khronos/default.nix
+++ b/pkgs/applications/office/khronos/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , nix-update-script
 , meson
@@ -6,25 +7,24 @@
 , vala
 , pkg-config
 , desktop-file-utils
-, pantheon
 , python3
 , glib
 , gtk4
 , json-glib
 , libadwaita
 , libgee
-, wrapGAppsHook
+, wrapGAppsHook4
 }:
 
 stdenv.mkDerivation rec {
   pname = "khronos";
-  version = "3.5.9";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8=";
+    sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     vala
     pkg-config
     python3
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
@@ -43,12 +43,14 @@ stdenv.mkDerivation rec {
     json-glib
     libadwaita
     libgee
-    pantheon.granite
   ];
 
   postPatch = ''
     chmod +x build-aux/post_install.py
     patchShebangs build-aux/post_install.py
+    # https://github.com/lainsce/khronos/pull/75
+    substituteInPlace build-aux/post_install.py \
+      --replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
   '';
 
   passthru = {