From 0a646acd334d209cc5b386a0eb1f227052a9fe5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Fri, 24 Jul 2026 12:21:45 +0800 Subject: [PATCH] jitsi: drop --- pkgs/by-name/ji/jitsi/jitsi.patch | 27 --------- pkgs/by-name/ji/jitsi/package.nix | 99 ------------------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 pkgs/by-name/ji/jitsi/jitsi.patch delete mode 100644 pkgs/by-name/ji/jitsi/package.nix diff --git a/pkgs/by-name/ji/jitsi/jitsi.patch b/pkgs/by-name/ji/jitsi/jitsi.patch deleted file mode 100644 index 07b16b919962..000000000000 --- a/pkgs/by-name/ji/jitsi/jitsi.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /home/dario/Downloads/jitsi/resources/install/generic/run.sh 2013-11-01 15:37:21.000000000 +0000 -+++ jitsi/resources/install/generic/run.sh 2014-03-04 11:52:30.796397567 +0000 -@@ -1,4 +1,9 @@ --mkdir -p $HOME/.sip-communicator/log -+#! /bin/bash -+# A modified version of the generic run.sh -+ -+#mkdir -p $HOME/.sip-communicator/log -+ -+cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" - - # Get architecture - ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/` -@@ -6,10 +11,12 @@ - # Additionnal JVM arguments - CLIENTARGS="" - -+NATIVELIBS="lib/native/linux-64" - if [ $ARCH = 32 ] - then - CLIENTARGS="-client -Xmx256m" -+ NATIVELIBS="lib/native/linux" - fi - - export PATH=$PATH:native --java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator -+LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/pkgs/by-name/ji/jitsi/package.nix b/pkgs/by-name/ji/jitsi/package.nix deleted file mode 100644 index bff74b04f310..000000000000 --- a/pkgs/by-name/ji/jitsi/package.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - makeDesktopItem, - unzip, - ant, - jdk8, - # Optional, Jitsi still runs without, but you may pass null: - alsa-lib, - dbus, - gtk2, - libpulseaudio, - openssl, - libxv, - libxscrnsaver, - libxext, - libx11, -}: - -let - jdk = jdk8; -in -stdenv.mkDerivation (finalAttrs: { - pname = "jitsi"; - version = "2.11.5633"; - - src = fetchFromGitHub { - owner = "jitsi"; - repo = "jitsi"; - tag = lib.versions.patch finalAttrs.version; - hash = "sha256-CN4o0VfHdoUteI2wyJ2hFJ9UsQ2wWUzcvrLMbR/l36M="; - }; - - patches = [ ./jitsi.patch ]; - - jitsiItem = makeDesktopItem { - name = "Jitsi"; - exec = "jitsi"; - comment = "VoIP and Instant Messaging client"; - desktopName = "Jitsi"; - genericName = "Instant Messaging"; - categories = [ "Chat" ]; - }; - - libPath = lib.makeLibraryPath [ - stdenv.cc.cc # For libstdc++. - alsa-lib - dbus - gtk2 - libpulseaudio - openssl - libx11 - libxext - libxscrnsaver - libxv - ]; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - ant - jdk - ]; - - buildPhase = "ant make"; - - installPhase = '' - mkdir -p $out - cp -a lib $out/ - rm -rf $out/lib/native/solaris - cp -a sc-bundles $out/ - mkdir $out/bin - cp resources/install/generic/run.sh $out/bin/jitsi - chmod +x $out/bin/jitsi - substituteInPlace $out/bin/jitsi \ - --subst-var-by JAVA ${jdk}/bin/java \ - --subst-var-by EXTRALIBS ${gtk2.out}/lib - sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi - patchShebangs $out - libPath="$libPath:${jdk.home}/lib/${jdk.architecture}" - find $out/ -type f -name '*.so' | while read file; do - patchelf --set-rpath "$libPath" "$file" && \ - patchelf --shrink-rpath "$file" - done - ''; - - meta = { - homepage = "https://desktop.jitsi.org/"; - description = "Open Source Video Calls and Chat"; - mainProgram = "jitsi"; - sourceProvenance = with lib.sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.jitsi ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d55f467d73f..16e98d3091b1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1113,6 +1113,7 @@ mapAliases { jhentai = throw "'jhentai' has been removed, as it is unmaintained"; # Added 2026-01-25 jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 jing = jing-trang; # Added 2025-09-18 + jitsi = throw "'jitsi' has been removed as it relies on gtk2 libraries"; # Added 2026-07-24 jmtpfs = throw "'jmtpfs' has been removed, as it is unmaintained"; # Added 2026-06-06 joplin = joplin-cli; # Added 2025-11-03 jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25