diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 13:30:11 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 13:30:11 +0200 |
| commit | d7a721d7267e19dd114625e8e3d5c96c95c84e89 (patch) | |
| tree | c4ea99718532a22518d7326ca390b7d54adb4e2f | |
| parent | 0fdabe7ab999ab12b06af6bb2f7aea5d3df81dc3 (diff) | |
gajim: Add python-axolotl as a runtime dependency
This is needed to run the OMEMO plugin: https://github.com/omemo/gajim-omemo I'm using drvAttrs directly here, so that we can pass propagatedBuildInputs properly to the wrapper (without duplicating the dependencies all over the place). Ideally, this will be fixed in <nixpkgs> but in a much more fine-grained way in that we are going to have Nix expressions for every single plugin and its dependencies. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | modules/user/aszlig/programs/gajim/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/user/aszlig/programs/gajim/default.nix b/modules/user/aszlig/programs/gajim/default.nix index d1218445..a3200b8a 100644 --- a/modules/user/aszlig/programs/gajim/default.nix +++ b/modules/user/aszlig/programs/gajim/default.nix @@ -37,11 +37,16 @@ let gtk-enable-animations = 0 ''; - gajimPatched = overrideDerivation pkgs.gajim (o: { + gajimPatched = let + o = pkgs.gajim.drvAttrs; + in pkgs.stdenv.mkDerivation (pkgs.gajim.drvAttrs // { patches = (o.patches or []) ++ singleton (pkgs.substituteAll { src = ./config.patch; nix_config = pkgs.writeText "gajim.config" (import ./config.nix lib); }) ++ singleton ./gnupg-2.1.13.patch; + propagatedBuildInputs = (o.propagatedBuildInputs or []) ++ [ + pkgs.pythonPackages.python-axolotl + ]; postPatch = (o.postPatch or "") + '' sed -i -e '/^export/i export GTK2_RC_FILES="${gtkTheme}"' \ scripts/gajim.in |