about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-11-05 19:09:01 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-11-05 19:09:01 +0100
commitd7ec4e38f95119bf8c6c5b912028840fcfbe7439 (patch)
treec0617d9f6542d8c45fd1a50339619df0d5928929 /machines
parentdc5f152773a578151e0cc5c177e15c1ebfd7f00d (diff)
machines/fliewatuet: Fix evaluation error
The jackline package only existed in nixpkgs for a short period of time
until it got reverted in
NixOS/nixpkgs@7e0ca08bfa19304b446f860a8899122ef019c51a.

As soon as jackline enters nixpkgs again, this commit can either be
reverted or just left as-is, because it uses pkgs.jackline only if the
attribute exists.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @sternenseemann
Diffstat (limited to 'machines')
-rw-r--r--machines/sternenseemann/fliewatuet.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/machines/sternenseemann/fliewatuet.nix b/machines/sternenseemann/fliewatuet.nix
index fe4af8e6..0f737d48 100644
--- a/machines/sternenseemann/fliewatuet.nix
+++ b/machines/sternenseemann/fliewatuet.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
    mytexlive = with pkgs.texlive; combine { inherit scheme-medium minted units collection-bibtexextra wrapfig; };
@@ -147,7 +147,6 @@ in {
     filezilla
     screen-message
     xmpp-client
-    jackline
 
     ## GUI
     # wm etc.
@@ -171,7 +170,7 @@ in {
     ## services
     gutenprint
     acpi
-  ];
+  ] ++ lib.optional (pkgs ? jackline) pkgs.jackline;
 
   fonts.fontconfig = {
     defaultFonts = {