From 096aa57d3794fb0986a6dac17a7c2d292e36040b Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 2 Nov 2024 23:41:19 +0400 Subject: [PATCH 1/5] kotatogram-desktop: specify license as all other tdesktop forks do --- .../instant-messengers/telegram/kotatogram-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index ad1173be2ed1..aa2d68f2b667 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -59,7 +59,7 @@ It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes ''; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.all; homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; From ca8eb1e29d1457cab21edc7821e3ed9e5624d12d Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 2 Nov 2024 23:42:32 +0400 Subject: [PATCH 2/5] kotatogram-desktop: fix changelog link --- .../telegram/kotatogram-desktop/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index aa2d68f2b667..1ee0f49ca0d1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -7,6 +7,9 @@ , yasm }: +let + version = "1.4.9"; +in (libsForQt5.callPackage ../telegram-desktop/default.nix { inherit stdenv; @@ -30,7 +33,7 @@ withWebKitGTK = false; }).overrideAttrs { pname = "kotatogram-desktop"; - version = "1.4.9-unstable-2024-09-27"; + version = "${version}-unstable-2024-09-27"; src = fetchFromGitHub { owner = "kotatogram"; @@ -62,7 +65,7 @@ license = licenses.gpl3Only; platforms = platforms.all; homepage = "https://kotatogram.github.io"; - changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; + changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k${version}"; maintainers = with maintainers; [ ilya-fedin ]; mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; }; From cfa05be0af5c1f79db1f048df3caecc2b50565c8 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 2 Nov 2024 23:39:54 +0400 Subject: [PATCH 3/5] kotatogram-desktop-with-webkit: inherit argv0 --- .../telegram/kotatogram-desktop/with-webkit.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 731042ac924a..684893491eda 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { postFixup = '' mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ + --inherit-argv0 \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]} ''; From 4340feec952b459b15053547ef5650bad521be47 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 2 Nov 2024 23:40:17 +0400 Subject: [PATCH 4/5] kotatogram-desktop-with-webkit: use mainProgram --- .../telegram/kotatogram-desktop/with-webkit.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 684893491eda..0976f18bf9c7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { ''; postFixup = '' mkdir -p $out/bin - makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ + makeWrapper {${kotatogram-desktop},$out}/bin/${kotatogram-desktop.meta.mainProgram} \ --inherit-argv0 \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]} From 5bd8cc4f3cf4a3f2e087de4b22c7cd870e6315e1 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 00:47:12 +0400 Subject: [PATCH 5/5] kotatogram-desktop-with-webkit: switch to binary wrapper --- .../telegram/kotatogram-desktop/with-webkit.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 0976f18bf9c7..f708b8a6246e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeWrapper }: +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeBinaryWrapper }: stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; version = kotatogram-desktop.version; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; dontUnpack = true; installPhase = '' mkdir -p $out @@ -12,7 +12,7 @@ stdenv.mkDerivation { ''; postFixup = '' mkdir -p $out/bin - makeWrapper {${kotatogram-desktop},$out}/bin/${kotatogram-desktop.meta.mainProgram} \ + makeBinaryWrapper {${kotatogram-desktop},$out}/bin/${kotatogram-desktop.meta.mainProgram} \ --inherit-argv0 \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]}