diff options
author | Profpatsch <mail@profpatsch.de> | 2016-04-29 07:02:24 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2016-04-29 07:02:24 +0200 |
commit | 728022e0d3143bc1c485187b07c933b95323cbeb (patch) | |
tree | 7e9ac4cec904612f9aea820f810a9f2474a6e487 /machines/profpatsch/pkgs.nix | |
parent | aa63f819165a5c5ffdca06b3e9d5ee0447cc433b (diff) |
machines/katara: restructure pkgs
Diffstat (limited to 'machines/profpatsch/pkgs.nix')
-rw-r--r-- | machines/profpatsch/pkgs.nix | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index b69bdded..f87ca3e2 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -1,19 +1,32 @@ { pkgs, lib }: +with pkgs; let addPythonRuntimeDeps = drv: deps: drv.overrideDerivation (old: { propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ deps; }); -in -with pkgs; -{ - - offlineimap = addPythonRuntimeDeps offlineimap [ pythonPackages.pygpgme ]; - - taffybar = taffybar.override { - ghcWithPackages = (haskellPackages.override { + # containered = name: packages: users: { ... }: + # { + # containers."${name}" = { + # config = { + # environment.systemPackages = packages; + # users.users = users; + # services.sshd.enable = true; + # }; + # privateNetwork = true; + # localAddress = "127.0.0.2"; + # }; + # nixpkgs.config.allowUnfree = true; + # }; + + # pkgs + + offlineimap = addPythonRuntimeDeps pkgs.offlineimap [ pkgs.pythonPackages.pygpgme ]; + + taffybar = pkgs.taffybar.override { + ghcWithPackages = (pkgs.haskellPackages.override { overrides = _: super: { taffybar = super.taffybar.overrideDerivation (old: { name = old.name + "foo"; @@ -27,11 +40,17 @@ with pkgs; }; # sent = pkgs:q.sent.override { patches = [ ./sent-bg.patch ]; }; - inherit sent; # mpv = pkgs.mpv.override { scripts = [ pkgs.mpvScripts.convert ]; }; - inherit mpv; beets = pkgs.beets.override { enableAlternatives = true; }; -} + git-annex = pkgs.gitAndTools.git-annex.overrideDerivation (old: { + buildInputs = old.buildInputs ++ [ pkgs.makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/git-annex --prefix PATH ":" "${pkgs.lsof}/bin"; + ''; + }); + +in +{ inherit taffybar offlineimap sent mpv beets git-annex; } |