summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-03-11 13:09:34 +0100
committerlassulus <lassulus@lassul.us>2022-03-11 13:09:34 +0100
commit04f48503a4164f91192b147d6c16fc44dae41352 (patch)
tree53b356c9eeb925f7be9859645996c0af0a823796 /tv/5pkgs/default.nix
parent97dc81c31e56901a2c8702dcf6cb474338123ec2 (diff)
parent15595864d2b70573b2ae0f08fce976226704491b (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/5pkgs/default.nix')
-rw-r--r--tv/5pkgs/default.nix57
1 files changed, 15 insertions, 42 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index cae5da112..2b9bdeeba 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,47 +1,20 @@
with import <stockholm/lib>;
+let
+ pushBack = x: xs:
+ if elem x xs then
+ remove x xs ++ [ x ]
+ else
+ names;
+in
self: super:
# Import files and subdirectories like they are overlays.
-foldl' mergeAttrs {}
- (map
- (name: import (./. + "/${name}") self super)
- (filter
- (name: name != "default.nix" && !hasPrefix "." name)
- (attrNames (readDir ./.))))
-
-//
-
-{
- cr = self.writeDashBin "cr" ''
- set -efu
- if test -n "''${XDG_RUNTIME_DIR-}"; then
- cache_dir=$XDG_RUNTIME_DIR/chromium-disk-cache
- else
- cache_dir=/tmp/chromium-disk-cache_$LOGNAME
- fi
- export LC_TIME=de_DE.utf8
- exec ${self.chromium}/bin/chromium \
- --ssl-version-min=tls1 \
- --disk-cache-dir="$cache_dir" \
- --disk-cache-size=50000000 \
- "$@"
- '';
-
- dhcpcd = overrideDerivation super.dhcpcd (old: {
- configureFlags = old.configureFlags ++ [
- "--dbdir=/var/lib/dhcpcd"
- ];
- });
-
- gitAndTools = super.gitAndTools // {
- inherit (self) diff-so-fancy;
- };
-
- ff = self.writeDashBin "ff" ''
- exec ${self.firefoxWrapper}/bin/firefox "$@"
- '';
-
- gnupg = self.gnupg22;
-
-}
+fix
+ (foldl' (flip extends) (_: super)
+ (map
+ (name: import (./. + "/${name}"))
+ (filter
+ (name: name != "default.nix" && !hasPrefix "." name)
+ (pushBack "override"
+ (attrNames (readDir ./.))))))