* Remove some incorrect uses of makeOverridable.

svn path=/nixpkgs/trunk/; revision=18483
This commit is contained in:
Eelco Dolstra
2009-11-20 12:51:14 +00:00
parent f08928cfe6
commit 973b9cfde6
3 changed files with 20 additions and 19 deletions

View File

@@ -1,4 +1,6 @@
{pkgs, ctags, writeScriptBin, lib, makeOverridable}:
{ pkgs, ctags, writeScriptBin }:
with pkgs.stdenv.lib;
# define some ctags wrappers adding support for some not that common languages
# customization:
@@ -13,9 +15,9 @@
# the derivation. use language extensions specified by args
ctagsWrapped = makeOverridable ( {args, name} : pkgs.writeScriptBin name ''
#!/bin/sh
exec ${pkgs.ctags}/bin/ctags ${lib.concatStringsSep " " (map lib.escapeShellArg args)} "$@"
exec ${pkgs.ctags}/bin/ctags ${concatStringsSep " " (map escapeShellArg args)} "$@"
'') {
args = let x = pkgs.ctagsWrapped; in lib.concatLists [
args = let x = pkgs.ctagsWrapped; in concatLists [
x.defaultArgs x.phpLang x.jsLang x.nixLang x.asLang x.rubyLang
];
name = "${ctags.name}-wrapped";