From d1f3ce25cb71ece73de8a067d97fd71f29ffa362 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Sep 2021 08:13:13 +0800 Subject: [PATCH 1/2] khronos: 1.0.8 -> 3.5.9 --- pkgs/applications/office/khronos/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index d35f8eec2eb1..b410171c02be 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -9,21 +9,22 @@ , pantheon , python3 , glib -, gtk3 +, gtk4 , json-glib +, libadwaita , libgee , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "khronos"; - version = "1.0.8"; + version = "3.5.9"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0d5ma1d86lh2apagwrwk0d1v1cm3fifjivhf530nlznb67vi1x80"; + sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8="; }; nativeBuildInputs = [ @@ -38,15 +39,16 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 + gtk4 json-glib + libadwaita libgee pantheon.granite ]; postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py ''; passthru = { From c6574c8664d39f6eede326d8348d21cbe1fd3f97 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Sep 2021 23:30:56 +0800 Subject: [PATCH 2/2] khronos: clarify license --- pkgs/applications/office/khronos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index b410171c02be..0238388d7eab 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lainsce/khronos"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; }