summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-30 09:16:10 +0200
committerlassulus <lass@aidsballs.de>2016-06-30 09:16:10 +0200
commit7550c663112c5a59e7c760c4b96c9bcc919fb175 (patch)
tree66ba4ef196bf81449a6a9ce26da23fc9eb77b353 /tv/5pkgs
parentf12578c66f8b7b829c0dec5255f358778c0d3366 (diff)
parent0c7a44139fba572487fe853310b6d88a6ffa21c3 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/5pkgs')
-rw-r--r--tv/5pkgs/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 607980807..affb535ef 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -16,6 +16,10 @@
erlang = pkgs.erlangR16;
};
ff = pkgs.callPackage ./ff {};
+ gnupg =
+ if elem config.krebs.build.host.name ["xu" "wu"]
+ then super.gnupg21
+ else super.gnupg;
q = pkgs.callPackage ./q {};
viljetic-pages = pkgs.callPackage ./viljetic-pages {};
xmonad-tv = import ./xmonad-tv.nix { inherit pkgs; };