diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-05-17 01:50:50 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-17 01:50:50 +0200 |
| commit | 3f3ea44528cde6de4acb635cdf609e6fb87be27b (patch) | |
| tree | 8f0de18d3bef3f07c73b210318fb9c565057fcf7 /machines/profpatsch | |
| parent | 0c7a53d2d0041c027f477fe89f8860ed5ae0b98d (diff) | |
machines/katara: Use unfreeAndNonDistributablePkgs
A more permanent fix for f50de454fd2f4c919195b1cc904b89343c243451. At least we can now easily change the underlying implementation. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
Diffstat (limited to 'machines/profpatsch')
| -rw-r--r-- | machines/profpatsch/katara.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index a64f2fbc..9c09d35d 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -1,12 +1,6 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, unfreeAndNonDistributablePkgs, lib, ... }: let - # TODO - tmpAllowUnfree = drv: - let n = import ../../nixpkgs-path.nix; - in (import n { config = { allowUnfree = true; }; })."${drv}"; - - myPkgs = import ./pkgs.nix { inherit pkgs lib; }; fish = pkgs.fish; @@ -158,7 +152,7 @@ in { # chromium # browser (chromium.override { enablePepperFlash = true; }) # droopy # simple HTML upload server - (tmpAllowUnfree "dropbox-cli") # dropbox.com client + unfreeAndNonDistributablePkgs.dropbox-cli # dropbox.com client emacs # pretty neat operating system i guess feh # brother of meh, displays images in a meh way, but fast filezilla # FTP GUI business-ready interface framework |