From 97e440e996e9c418e46af3dbcdba58595b5c11ea Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Apr 2017 23:55:55 +0200
Subject: pkgs: Add an overridden Gajim with old pycrypto

This is for the time being until either NixOS/nixpkgs#21671 has been
resolved or the next major version of Gajim has been released, because
the latter no longer uses pycrypto.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/managed/brawndo.nix            |  2 +-
 machines/aszlig/managed/tyree.nix              |  8 +++----
 modules/user/aszlig/programs/gajim/default.nix |  4 ++--
 pkgs/aszlig/default.nix                        |  3 ++-
 pkgs/aszlig/gajim/default.nix                  | 31 ++++++++++++++++++++++++++
 5 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/aszlig/gajim/default.nix

diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index 61e7925b..99bc1c32 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -59,7 +59,7 @@ in {
     vuizvui.aszlig.axbo
     chromium
     file
-    gajim
+    vuizvui.aszlig.gajim
     gimp
     git
     gpodder
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index 7b14628c..9d7dfffe 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -8,10 +8,10 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   environment.systemPackages = with pkgs; [
-    calibre cdparanoia chromium figlet gajim gimp htop inkscape thunderbird
-    kdeApplications.gwenview kdeApplications.okular krita libreoffice mosh mpv
-    pciutils vlc vuizvui.aszlig.tomahawk wget wine youtubeDL
-    unfreeAndNonDistributablePkgs.skype
+    calibre cdparanoia chromium figlet vuizvui.aszlig.gajim gimp htop inkscape
+    thunderbird kdeApplications.gwenview kdeApplications.okular krita
+    libreoffice mosh mpv pciutils vlc vuizvui.aszlig.tomahawk wget wine
+    youtubeDL unfreeAndNonDistributablePkgs.skype
   ];
 
   fileSystems."/boot".device = "/dev/disk/by-uuid/A0D5-269D";
diff --git a/modules/user/aszlig/programs/gajim/default.nix b/modules/user/aszlig/programs/gajim/default.nix
index a4555cd1..8259eac1 100644
--- a/modules/user/aszlig/programs/gajim/default.nix
+++ b/modules/user/aszlig/programs/gajim/default.nix
@@ -38,8 +38,8 @@ let
   '';
 
   gajimPatched = let
-    o = pkgs.gajim.drvAttrs;
-  in pkgs.stdenv.mkDerivation (pkgs.gajim.drvAttrs // {
+    o = pkgs.vuizvui.aszlig.gajim.drvAttrs;
+  in pkgs.stdenv.mkDerivation (pkgs.vuizvui.aszlig.gajim.drvAttrs // {
     patches = (o.patches or []) ++ singleton (pkgs.substituteAll {
       src = ./config.patch;
       nix_config = pkgs.writeText "gajim.config" (import ./config.nix lib);
diff --git a/pkgs/aszlig/default.nix b/pkgs/aszlig/default.nix
index 1d2a3e0b..50a2bcfb 100644
--- a/pkgs/aszlig/default.nix
+++ b/pkgs/aszlig/default.nix
@@ -1,8 +1,9 @@
-{ callPackage, callPackage_i686, boost155 }:
+{ callPackage, callPackage_i686, boost155, gajim }:
 
 {
   aacolorize = callPackage ./aacolorize { };
   axbo = callPackage ./axbo { };
+  gajim = callPackage ./gajim { inherit gajim; };
   git-detach = callPackage ./git-detach { };
   grandpa = callPackage ./grandpa { };
   nixops = callPackage ./nixops { };
diff --git a/pkgs/aszlig/gajim/default.nix b/pkgs/aszlig/gajim/default.nix
new file mode 100644
index 00000000..a6bf4a11
--- /dev/null
+++ b/pkgs/aszlig/gajim/default.nix
@@ -0,0 +1,31 @@
+{ 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
+      '';
+    };
+  };
+}
-- 
cgit 1.4.1