diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/gajim/0.16-pre.nix | 89 | ||||
-rw-r--r-- | pkgs/nbxmpp/default.nix | 17 |
3 files changed, 0 insertions, 110 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 1743fd54..be8953d2 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -7,13 +7,9 @@ let self = { axbo = callPackage ./axbo { }; blop = callPackage ./blop { }; - gajim = callPackage ./gajim/0.16-pre.nix { - inherit (pkgs.xlibs) libX11; - }; libCMT = callPackage ./libcmt { }; librxtx_java = callPackage ./librxtx-java { }; lockdev = callPackage ./lockdev { }; - nbxmpp = callPackage ./nbxmpp { }; pvolctrl = callPackage ./pvolctrl { }; sidplayfp = callPackage ./sidplayfp { }; tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { }; diff --git a/pkgs/gajim/0.16-pre.nix b/pkgs/gajim/0.16-pre.nix deleted file mode 100644 index c11e0284..00000000 --- a/pkgs/gajim/0.16-pre.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ stdenv, fetchurl, fetchhg, python, intltool, pkgconfig, libX11, gtk -, host, pyopenssl, pythonDBus, pythonPackages, nbxmpp - -, enableJingle ? true, farstream ? null, gst_plugins_bad ? null -, libnice ? null -, enableE2E ? true -, enableRST ? true -, enableSpelling ? true, gtkspell ? null -, enableNotifications ? false -, enableLaTeX ? false, texLive ? null - -# FIXME: Remove after final release. -, autoconf, automake, libtool -}: - -assert enableJingle -> farstream != null && gst_plugins_bad != null - && libnice != null; -assert enableE2E -> pythonPackages.pycrypto != null; -assert enableRST -> pythonPackages.docutils != null; -assert enableSpelling -> gtkspell != null; -assert enableNotifications -> pythonPackages.notify != null; -assert enableLaTeX -> texLive != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "gajim-${version}"; - version = "0.16"; - - src = fetchhg { - url = "http://hg.gajim.org/gajim"; - rev = "f38e5fd4f8e3"; - sha256 = "17wmy355znfkv4fbwa4hzicr17k8if75mh3b14yphszfw3bh3mfw"; - }; - - preConfigure = '' - sed -e 's/\<which\>/type -P/' autogen.sh | sh - ''; - - postPatch = '' - sed -i -e '0,/^[^#]/ { - /^[^#]/i export \\\ - PYTHONPATH="'"$PYTHONPATH\''${PYTHONPATH:+:}\$PYTHONPATH"'" \\\ - GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${"" - }$GST_PLUGIN_PATH"'" - }' scripts/gajim.in - - sed -i -e 's/return helpers.is_in_path('"'"'nslookup.*/return True/' \ - src/features_window.py - sed -i -e '/is_in_path\|return \[.host/'"s|'host'|'${host}/bin/host'|" \ - src/common/resolver.py - '' + optionalString enableSpelling '' - sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ - src/gtkspell.py - '' + optionalString enableLaTeX '' - sed -i -e "s|try_run(.'dvipng'|try_run(['${texLive}/bin/dvipng'|" \ - -e "s|try_run(.'latex'|try_run(['${texLive}/bin/latex'|" \ - -e 's/tmpfd.close()/os.close(tmpfd)/' \ - src/common/latex.py - ''; - - buildInputs = [ - python intltool pkgconfig libX11 - pythonPackages.pygobject pythonPackages.pyGtkGlade - pythonPackages.sqlite3 pythonPackages.pyasn1 - pythonPackages.pyxdg nbxmpp - pyopenssl pythonDBus - # FIXME: Remove after final release. - autoconf automake libtool - ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] - ++ optional enableE2E pythonPackages.pycrypto - ++ optional enableRST pythonPackages.docutils - ++ optional enableNotifications pythonPackages.notify - ++ optional enableLaTeX texLive; - - postInstall = '' - install -m 644 -t "$out/share/gajim/icons/hicolor" \ - "icons/hicolor/index.theme" - ''; - - enableParallelBuilding = true; - - meta = { - homepage = "http://gajim.org/"; - description = "Jabber client written in PyGTK"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.raskin maintainers.aszlig ]; - }; -} diff --git a/pkgs/nbxmpp/default.nix b/pkgs/nbxmpp/default.nix deleted file mode 100644 index fa306432..00000000 --- a/pkgs/nbxmpp/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage }: - -buildPythonPackage rec { - name = "nbxmpp-0.4"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/4"; - sha256 = "073qhz6vgsym4rkgwj801girl8xqhlbr37xn5lg0za9c61vmwayh"; - }; - - meta = { - homepage = "https://python-nbxmpp.gajim.org/"; - description = "Non-blocking Jabber/XMPP module"; - license = stdenv.lib.licenses.gpl3; - }; -} |