diff options
Diffstat (limited to 'pkgs/aszlig')
-rw-r--r-- | pkgs/aszlig/default.nix | 3 | ||||
-rw-r--r-- | pkgs/aszlig/gajim/default.nix | 33 |
2 files changed, 1 insertions, 35 deletions
diff --git a/pkgs/aszlig/default.nix b/pkgs/aszlig/default.nix index acc2256b..d2bbeb77 100644 --- a/pkgs/aszlig/default.nix +++ b/pkgs/aszlig/default.nix @@ -1,9 +1,8 @@ -{ callPackage, callPackage_i686, boost155, gajim, vim_configurable, xournal }: +{ callPackage, callPackage_i686, vim_configurable, xournal }: { aacolorize = callPackage ./aacolorize { }; axbo = callPackage ./axbo { }; - gajim = callPackage ./gajim { inherit gajim; }; git-detach = callPackage ./git-detach { }; grandpa = callPackage ./grandpa { }; librxtx_java = callPackage ./librxtx-java { }; diff --git a/pkgs/aszlig/gajim/default.nix b/pkgs/aszlig/gajim/default.nix deleted file mode 100644 index 840aa9a1..00000000 --- a/pkgs/aszlig/gajim/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, gmp, pythonPackages -, gajim -}: - -(gajim.override { - pythonPackages = pythonPackages // { - pycrypto = pythonPackages.buildPythonPackage rec { - name = "pycrypto-${version}"; - version = "2.6.1"; - - src = fetchurl { - url = "mirror://pypi/p/pycrypto/${name}.tar.gz"; - sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"; - }; - - patches = stdenv.lib.singleton (fetchpatch { - name = "CVE-2013-7459.patch"; - url = "https://anonscm.debian.org/cgit/collab-maint/python-crypto.git" - + "/plain/debian/patches/CVE-2013-7459.patch?h=debian/2.6.1-7"; - sha256 = "01r7aghnchc1bpxgdv58qyi2085gh34bxini973xhy3ks7fq3ir9"; - }); - - buildInputs = [ gmp ]; - - preConfigure = '' - sed -i 's,/usr/include,/no-such-dir,' configure - sed -i "s!,'/usr/include/'!!" setup.py - ''; - }; - }; -}) // { - meta = gajim.meta // { platforms = [ "x86_64-linux" ]; }; -} |