From 2eea0f646c2c95232cd7baa70d0e68dd0e13cfd3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Apr 2018 21:43:13 +0200 Subject: Remove my patched version of Gajim everywhere The config.patch doesn't apply for Gajim 1.0 anymore anyway, so let's throw everything away, including my custom config in order to start with a new abomination. With the new approach, I'm going to patch the configuration defaults *directly* into Gajim, because one of the problems with the old approach was that whenever specifics about a configuration value has changed, I didn't get noticed by a patch failure. So in the end the config I was ending up was a big mess. I'm going to start this with a new unpatched version and someday get to a patched version that I'm staisfied with... hopefully ;-) Signed-off-by: aszlig --- modules/user/aszlig/programs/gajim/default.nix | 70 -------------------------- 1 file changed, 70 deletions(-) delete mode 100644 modules/user/aszlig/programs/gajim/default.nix (limited to 'modules/user/aszlig/programs/gajim/default.nix') diff --git a/modules/user/aszlig/programs/gajim/default.nix b/modules/user/aszlig/programs/gajim/default.nix deleted file mode 100644 index 8259eac1..00000000 --- a/modules/user/aszlig/programs/gajim/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.vuizvui.user.aszlig.programs.gajim; - - gtkTheme = pkgs.writeText "gajim.gtkrc" '' - style "default" { - fg[NORMAL] = "#d5faff" - fg[ACTIVE] = "#fffeff" - fg[SELECTED] = "#fffeff" - fg[INSENSITIVE] = "#85aaaf" - fg[PRELIGHT] = "#d7f2ff" - - text[NORMAL] = "#fffefe" - text[ACTIVE] = "#fffeff" - text[SELECTED] = "#fffeff" - text[INSENSITIVE] = "#85aaaf" - text[PRELIGHT] = "#d7f2ff" - - bg[NORMAL] = "#0f4866" - bg[ACTIVE] = "#0c232e" - bg[SELECTED] = "#005a56" - bg[INSENSITIVE] = "#103040" - bg[PRELIGHT] = "#1d5875" - - base[NORMAL] = "#0c232e" - base[ACTIVE] = "#0f4864" - base[SELECTED] = "#005a56" - base[INSENSITIVE] = "#103040" - base[PRELIGHT] = "#1d5875" - } - - class "GtkWidget" style "default" - - gtk-enable-animations = 0 - ''; - - gajimPatched = let - 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); - }); - propagatedBuildInputs = (o.propagatedBuildInputs or []) ++ [ - pkgs.pythonPackages.python-axolotl - ]; - postPatch = (o.postPatch or "") + '' - # Disable a few config-related and GUI tests that won't work with our - # patches. - sed -i -e '/integration\.test_roster/d' \ - -e '/unit.test_gui_interface/d' \ - test/runtests.py - - sed -i -e '/^export/i export GTK2_RC_FILES="${gtkTheme}"' \ - scripts/gajim.in - ''; - }); - -in { - options.vuizvui.user.aszlig.programs.gajim = { - enable = mkEnableOption "aszlig's Gajim"; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ gajimPatched ]; - }; -} -- cgit 1.4.1