* Remove some incorrect uses of makeOverridable.

svn path=/nixpkgs/trunk/; revision=18483

pkgs/development/interpreters/ruby/default.nix

@@ -1,26 +1,25 @@
-{stdenv, fetchurl, ncurses, readline
-  , lib
-  , zlib ? null
-  , openssl ? null
-  , gdbm ? null
-  , makeOverridable
+{ stdenv, fetchurl, ncurses, readline
+, zlib ? null
+, openssl ? null
+, gdbm ? null
 }:
 
-makeOverridable (stdenv.mkDerivation) rec {
+stdenv.mkDerivation rec {
   version = "1.8.7-p72";
+  
   name = "ruby-${version}";
+  
   src = fetchurl {
     url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
     sha256 = "e15ca005076f5d6f91fc856fdfbd071698a4cadac3c6e25855899dba1f6fc5ef";
   };
 
   buildInputs = [ncurses readline]
-    ++(lib.optional (zlib != null) zlib)
-    ++(lib.optional (openssl != null) openssl)
-    ++(lib.optional (gdbm != null) gdbm)
-  ;
-  configureFlags = ["--enable-shared" "--enable-pthread"] ;
-
+    ++ (stdenv.lib.optional (zlib != null) zlib)
+    ++ (stdenv.lib.optional (openssl != null) openssl)
+    ++ (stdenv.lib.optional (gdbm != null) gdbm);
+    
+  configureFlags = ["--enable-shared" "--enable-pthread"];
 
   # NIX_LDFLAGS = "-lpthread -lutil";
 

pkgs/development/tools/misc/ctags/wrapped.nix

@@ -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";

pkgs/top-level/all-packages.nix

@@ -2356,9 +2356,9 @@ let
   };
 
   ruby18 = import ../development/interpreters/ruby {
-    inherit fetchurl stdenv readline ncurses zlib lib openssl makeOverridable gdbm;
+    inherit fetchurl stdenv readline ncurses zlib openssl gdbm;
   };
-  ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; };
+  #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; };
   ruby = ruby18;
 
   rubyLibs = recurseIntoAttrs (import ../development/interpreters/ruby/libs.nix {
@@ -2577,7 +2577,7 @@ let
   };
 
   ctagsWrapped = import ../development/tools/misc/ctags/wrapped.nix {
-    inherit pkgs ctags writeScriptBin lib makeOverridable;
+    inherit pkgs ctags writeScriptBin;
   };
 
   cmake = import ../development/tools/build-managers/cmake {