From 040cf06388b1d5d94c0087c0243fd8fcf2502dce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 May 2012 17:19:07 +0000
Subject: * Add a type "path".

svn path=/nixpkgs/trunk/; revision=34247
---
 pkgs/lib/types.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pkgs/lib/types.nix')

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index c1d7240f693..2c85ee0077a 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -64,7 +64,7 @@ rec {
 
     string = mkOptionType {
       name = "string";
-      check = lib.traceValIfNot (x: builtins ? isString -> builtins.isString x);
+      check = lib.traceValIfNot builtins.isString;
       merge = lib.concatStrings;
     };
 
@@ -86,6 +86,12 @@ rec {
       check = lib.traceValIfNot isDerivation;
     };
 
+    path = mkOptionType {
+      name = "path";
+      # Hacky: there is no ‘isPath’ primop.
+      check = lib.traceValIfNot (x: builtins.substring 0 1 (toString x) == "/");
+    };
+
     listOf = types.list;
     list = elemType: mkOptionType {
       name = "list of ${elemType.name}s";
-- 
cgit 1.4.1