summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-11-25 00:19:17 +0100
committerlassulus <lass@aidsballs.de>2016-11-25 00:19:17 +0100
commit8014aa6594a6bb442a950abed67dd13543d34d88 (patch)
tree101817d3948442b5294f1f23543a7ac9df9f0ddd /tv/5pkgs/default.nix
parent2ea9b739ac64773de0a490736d6e1bdf556c6b60 (diff)
parentb3c6e9a2bde5d1c911d1bb17ca3218acab7285b8 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/5pkgs/default.nix')
-rw-r--r--tv/5pkgs/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 4eb8a10b4..ae47ab0f3 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -35,9 +35,6 @@ with import <stockholm/lib>;
ff = pkgs.writeDashBin "ff" ''
exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
'';
- gnupg =
- if elem config.krebs.build.host.name ["xu" "wu"]
- then super.gnupg21
- else super.gnupg;
+ gnupg = pkgs.gnupg21;
};
}