about summary refs log tree commit diff
path: root/overrides
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-10-08 21:54:57 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-10-08 21:56:06 +0200
commit3c92534f104466b755df76d6c9818ffecd217110 (patch)
tree8265e1ff240b1c1321e3f240a09a522007fba1a8 /overrides
parent4f54940fd0123e62eaa9064cd76735f1377dfd53 (diff)
Revert "gajim: Update to v0.16-rc2."
This reverts commit aae2e9db0db3c2bd178896a68cefb49b78c9ab3e.

Gajim version 0.16 is officially released, so we don't need this
override anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'overrides')
-rw-r--r--overrides/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/overrides/default.nix b/overrides/default.nix
index 451547e0..3ea66eb4 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -60,21 +60,12 @@ let
 
   # derivation overrides
   drvOverrides = mapOverride overrideDerivation argOverrides {
-    gajim = o: rec {
-      name = "gajim-${version}";
-      version = "0.16-rc2";
-      src = everything.fetchurl {
-        url = "http://gajim.org/downloads/0.16/${name}.tar.gz";
-        sha256 = "0fl6mf5ws14spcx6wbb8zxay7j2109sxr4f3fz23z5nplab3i2aj";
-      };
-      patches = tail o.patches ++ singleton gajimPatch;
+    gajim = o: {
+      patches = (o.patches or []) ++ singleton gajimPatch;
       postPatch = (o.postPatch or "") + ''
         sed -i -e '/^export/i export GTK2_RC_FILES="${gajimGtkTheme}"' \
           scripts/gajim.in
       '';
-      prePatch = (o.preConfigure or "") + ''
-        addPythonPath "${everything.pythonPackages.nbxmpp}"
-      '';
     };
 
     i3 = o: {