diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-29 08:21:21 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-29 08:21:21 +0000 |
commit | ba498d4a43971c454a183e407e26e7803fbf8612 (patch) | |
tree | 9e5296c245def8938243bf91491031c4886cd09e /pkgs/servers | |
parent | 41b7a3cda6f43f939920ec26bc0ce3a959125e19 (diff) | |
download | nixlib-ba498d4a43971c454a183e407e26e7803fbf8612.tar nixlib-ba498d4a43971c454a183e407e26e7803fbf8612.tar.gz nixlib-ba498d4a43971c454a183e407e26e7803fbf8612.tar.bz2 nixlib-ba498d4a43971c454a183e407e26e7803fbf8612.tar.lz nixlib-ba498d4a43971c454a183e407e26e7803fbf8612.tar.xz nixlib-ba498d4a43971c454a183e407e26e7803fbf8612.tar.zst nixlib-ba498d4a43971c454a183e407e26e7803fbf8612.zip |
* composedArgsAndFun -> makeOverridable for consistency.
* Rename a few single-version packages to "default.nix". svn path=/nixpkgs/trunk/; revision=22803
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/replacements.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/replacements.nix b/pkgs/servers/x11/xorg/replacements.nix index 3a7ac34e6181..175d05b0a364 100644 --- a/pkgs/servers/x11/xorg/replacements.nix +++ b/pkgs/servers/x11/xorg/replacements.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, xorg, automake, autoconf, libtool, composedArgsAndFun}: +{stdenv, fetchurl, xorg, automake, autoconf, libtool, makeOverridable}: { xf86videoati = {src, suffix}: - composedArgsAndFun stdenv.mkDerivation { + makeOverridable stdenv.mkDerivation { name = "xf86-video-ati-${suffix}"; buildInputs = xorg.xf86videoati.buildInputs ++ [autoconf automake libtool]; |