From 943592f69850fd07dd2422da062b1c1ebc45974d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 31 Jan 2018 14:02:19 -0500
Subject: Add setFunctionArgs lib function.

Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
---
 lib/generators.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/generators.nix')

diff --git a/lib/generators.nix b/lib/generators.nix
index f207033c9554..73017f2c6796 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -14,6 +14,8 @@ let
   libAttr = lib.attrsets;
 
   flipMapAttrs = flip libAttr.mapAttrs;
+
+  inherit (lib) isFunction;
 in
 
 rec {
@@ -110,7 +112,7 @@ rec {
     else if isString   v then "\"" + v + "\""
     else if null ==    v then "null"
     else if isFunction v then
-      let fna = functionArgs v;
+      let fna = lib.functionArgs v;
           showFnas = concatStringsSep "," (libAttr.mapAttrsToList
                        (name: hasDefVal: if hasDefVal then "(${name})" else name)
                        fna);
-- 
cgit 1.4.1