diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix deleted file mode 100644 index 58335bed4218..000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages -, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 -, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib -}: - -mkDerivation rec { - pname = "swift-im"; - version = "4.0.2"; - - src = fetchurl { - url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; - }; - - patches = [ ./qt-5.11.patch ./scons.patch ]; - - nativeBuildInputs = [ pkg-config qttools sconsPackages.scons_3_1_2 ]; - - buildInputs = [ - GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 - lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib - ]; - - propagatedUserEnvPkgs = [ GConf ]; - - NIX_CFLAGS_COMPILE = toString [ - "-I${libxml2.dev}/include/libxml2" - "-I${miniupnpc}/include/miniupnpc" - "-I${qtwebkit.dev}/include/QtWebKit" - "-I${qtwebkit.dev}/include/QtWebKitWidgets" - "-fpermissive" - ]; - - installTargets = [ (placeholder "out") ]; - installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://swift.im/"; - description = "Qt XMPP client"; - license = licenses.gpl3; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch deleted file mode 100644 index 911e7570427f..000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h -+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h -@@ -8,6 +8,7 @@ - - #include - -+#include - #include - - #include diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch deleted file mode 100644 index c63b05d7acb1..000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot -index 40f242513..53e1ff26a 100644 ---- a/BuildTools/SCons/SConscript.boot -+++ b/BuildTools/SCons/SConscript.boot -@@ -508,6 +508,7 @@ if env.get("distcc", False) : - if var.startswith("DISTCC_") : - env["ENV"][var] = os.environ[var] - -+env["ENV"] = os.environ - conf_env = env.Clone() - - Export("env") -diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct -index 70bffbcfe..fef281899 100644 ---- a/BuildTools/SCons/SConstruct -+++ b/BuildTools/SCons/SConstruct -@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] - gconf_env = conf_env.Clone() - conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) - if conf.CheckPKG("gconf-2.0") : -- gconf_bare_env = Environment() -+ gconf_bare_env = Environment(ENV = os.environ) - gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') - if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : - gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] -@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags) - env["HAVE_HUNSPELL"] = 0; - if env.get("hunspell_enable", False) : - hunspell_conf = Configure(hunspell_env) -- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") : -+ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") : - env["HAVE_HUNSPELL"] = 1 -- hunspell_flags["LIBS"] = ["hunspell"] -+ hunspell_flags["LIBS"] = ["hunspell-1.6"] - env["HUNSPELL_FLAGS"] = hunspell_flags - hunspell_conf.Finish() - -diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py -index 89f8963dc..b8559f7a6 100644 ---- a/BuildTools/SCons/Tools/textfile.py -+++ b/BuildTools/SCons/Tools/textfile.py -@@ -113,7 +113,10 @@ def _action(target, source, env): - lsep = None - for s in source: - if lsep: fd.write(lsep) -- fd.write(_do_subst(s, subs)) -+ b = _do_subst(s, subs) -+ if isinstance(b, unicode): -+ b = b.encode('UTF-8') -+ fd.write(b) - lsep = linesep - fd.close() - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ed6c3d70e72..aaadcbfe8ac0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1457,6 +1457,7 @@ mapAliases ({ surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14 sweep-visualizer = throw "'sweep-visualizer' is abondoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-15 + swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swfdec = throw "swfdec has been removed as broken and unmaintained"; # Added 2020-08-23 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b344cd081b69..dbe8a68ae277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32534,11 +32534,6 @@ with pkgs; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { - inherit (gnome2) GConf; - boost = boost168; - }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { inherit (darwin.apple_sdk.frameworks) Foundation; };