diff options
Diffstat (limited to 'tv')
-rw-r--r-- | tv/1systems/alnus/config.nix | 4 | ||||
-rw-r--r-- | tv/1systems/mu/config.nix | 4 | ||||
-rw-r--r-- | tv/1systems/querel/config.nix | 4 | ||||
-rw-r--r-- | tv/5pkgs/default.nix | 2 | ||||
-rw-r--r-- | tv/5pkgs/override/default.nix | 2 | ||||
-rw-r--r-- | tv/5pkgs/simple/default.nix | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index c09e7f9b1..bddd69efa 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -18,8 +18,8 @@ with import <stockholm/lib>; environment.systemPackages = [ pkgs.firefox pkgs.networkmanagerapplet - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) ]; diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 21be25766..00bd5da15 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -63,8 +63,8 @@ with import <stockholm/lib>; pkgs.iptables pkgs.libreoffice pkgs.plasma-pa - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.skypeforlinux pkgs.slock diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index ad82915f4..44c7685e8 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -26,8 +26,8 @@ with import <stockholm/lib>; pkgs.gimp pkgs.kate pkgs.libreoffice - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.sxiv pkgs.texlive.combined.scheme-full diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 4f6643c7e..5a018a166 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,4 +1,4 @@ -with import <stockholm/lib>; +with import ../../lib; let pushBack = x: xs: if elem x xs then diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix index 4cc4749d0..f719a9f69 100644 --- a/tv/5pkgs/override/default.nix +++ b/tv/5pkgs/override/default.nix @@ -1,4 +1,4 @@ -with import <stockholm/lib>; +with import ../../../lib; self: super: mapNixDir (path: import path self super) ./. diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix index 6ba4fec83..9fb45dd1a 100644 --- a/tv/5pkgs/simple/default.nix +++ b/tv/5pkgs/simple/default.nix @@ -1,4 +1,4 @@ -with import <stockholm/lib>; +with import ../../../lib; self: super: |