diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix index a95611af6fe..96cdec1cef5 100644 --- a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix +++ b/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix @@ -18,7 +18,7 @@ args : with args; with builderDefs; }) // args); in with localDefs; stdenv.mkDerivation rec { - name = "ldcpp-"+version; + name = "ldcpp-1.0.3"; builder = writeScript (name + "-builder") (textClosure localDefs [doScons doForceShare doPropagate]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f1868095eb..da03ee8b5e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6396,7 +6396,7 @@ let inherit fetchurl stdenv builderDefs stringsWithDeps fftw ladspaH pkgconfig; }; - ldcpp = composedArgsAndFun (selectVersion ../applications/networking/p2p/ldcpp "1.0.1") { + ldcpp = composedArgsAndFun (import ../applications/networking/p2p/ldcpp/1.0.3.nix) { inherit builderDefs scons pkgconfig bzip2 openssl; inherit (gtkLibs) gtk; inherit (gnome) libglade; @@ -7676,15 +7676,6 @@ let inherit fetchurl stdenv flex bison zlib libpng ncurses ed; }; - /* - tetexX11 = import ../misc/tex/tetex { - inherit fetchurl stdenv flex bison zlib libpng ncurses ed; - inherit (xlibs) libX11 libXext libXmu libXaw libXt libXpm; - inherit freetype t1lib; - builderX11 = true; - }; - */ - texFunctions = import ../misc/tex/nix { inherit stdenv perl tetex graphviz ghostscript makeFontsConf imagemagick; };