diff options
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/profpatsch/katara.nix | 9 | ||||
| -rw-r--r-- | machines/profpatsch/pkgs.nix | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index 72e88539..9b837e83 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -147,8 +147,7 @@ in { # needs user service redshift # increases screen warmth at night (so i don’t have to feel cold) ]; - in systemPkgs ++ xPkgs ++ guiPkgs ++ userPrograms ++ mailPkgs ++ nixPkgs ++ tmpPkgs; - + in systemPkgs ++ xPkgs ++ guiPkgs ++ userPrograms ++ nixPkgs ++ mailPkgs ++ nixPkgs ++ tmpPkgs; system.extraDependencies = with pkgs; lib.singleton ( # Haskell packages I want to keep around haskellPackages.ghcWithPackages (hpkgs: with hpkgs; @@ -159,14 +158,14 @@ in { gtk frpnow-gtk frpnow-gloss + taffybar.env ])) ++ # other packages that I use sometimes in a shell [ - wkhtmltopdf + #wkhtmltopdf ]; - ########### # Services @@ -309,7 +308,7 @@ in { # Misc # TODO seems to work only sometimes in chromium - security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; + # security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; ######## # Fixes diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index 9605cf2b..ff6a2280 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -1,8 +1,14 @@ { pkgs }: -{ - offlineimap = with pkgs; offlineimap.overrideDerivation (old: { - propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ [ pythonPackages.pygpgme ]; +let + addRuntimeDeps = drv: ds: drv.overrideDerivation (old: { + propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ ds; }); +in +with pkgs; +{ + + offlineimap = addRuntimeDeps offlineimap [ pythonPackages.pygpgme ]; + } |