diff options
author | Ludovic Courtès <ludo@gnu.org> | 2011-11-20 20:42:05 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2011-11-20 20:42:05 +0000 |
commit | 244816121329a1a25acb091bba8e43d61c3fc02b (patch) | |
tree | 358afabaa09f34cbf1ca1bff56ad8eee740b9d78 /pkgs/stdenv/adapters.nix | |
parent | e0f38af4e32c0a634b692614f1cc8b2d8d8734e4 (diff) |
stdenv adapters: Use `toString' instead of `exprToString'.
svn path=/nixpkgs/trunk/; revision=30494
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 311d967c0a344..4c6cd24a973f7 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -302,7 +302,7 @@ rec { else null; in - builtins.trace "@:drv:${toString drvPath}:${builtins.exprToString license}:@" + builtins.trace "@:drv:${toString drvPath}:${builtins.toString license}:@" val; in pkg // { outPath = printDrvPath pkg.outPath; @@ -338,12 +338,10 @@ rec { validate = arg: if licensePred license then arg - else abort " - Error while building ${builtins.unsafeDiscardStringContext pkg.drvPath}: - The license predicate is not verified. - - bad license: ${builtins.exprToString license} - "; + else abort '' + while building ${builtins.unsafeDiscardStringContext pkg.drvPath}: + license `${builtins.toString license}' does not pass the predicate. + ''; in pkg // { outPath = validate pkg.outPath; |