summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-11-27 15:24:22 +0100
committermakefu <github@syntax-fehler.de>2016-11-27 15:24:22 +0100
commitb94fc3265b92f70ecb4507484e378e8f8084477c (patch)
treee9acdb99cafdd1362bb98a8f00139dde6edef6a4 /tv/5pkgs
parentbcc2b327c4dbd34162db8cf81fbbc7688feafd9a (diff)
parentda3022389d1da7ac9c2ca42eb2d16582b96e0074 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/5pkgs')
-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;
};
}