diff options
Diffstat (limited to 'pkgs/development/tools')
5 files changed, 69 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index d23940dda945..9d6ab6ba8159 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -13,16 +13,15 @@ stdenv.mkDerivation { sha256 = "0qk74nrnm9qlijrq6gmy8cyhjgp0gis4zx44divnr8n487d5308a"; }; + buildInputs = [python makeWrapper]; + preConfigure = '' - for i in script/* - do + for i in "script/"*; do substituteInPlace $i --replace "/usr/bin/env python" "${python}/bin/python" done ''; - - propagatedBuildInputs = [python makeWrapper]; - buildPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) --hardlink-scons -O1"; - installPhase = "for n in $out/bin/*; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done"; + buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1"; + installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done"; meta = { homepage = "http://scons.org/"; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 899343d12ff8..9d15dc29772d 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = "--release" + (if qt == null then "" else " --with-doxywizard") ; - + makeFlags = "MAN1DIR=share/man/man1"; preConfigure = (if (qt == null) then "" diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index e372350e3846..b81cb9223bc3 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { '' configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" CXXFLAGS="-O2 -fno-strict-aliasing" + --mandir=$out/share/man ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix new file mode 100644 index 000000000000..e1f85f745759 --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -0,0 +1,54 @@ +{stdenv, fetchurl, m4, ncurses, ocaml, writeText}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "1.2.6"; +in + +stdenv.mkDerivation { + name = "ocaml-findlib-${version}"; + + src = fetchurl { + url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; + sha256 = "1b6z5lylsjxxaifw2yc21cs0dc84zqi4q57sgwg4j8k3m60ivpxs"; + }; + + buildInputs = [m4 ncurses ocaml]; + + patches = [ ./ldconf.patch ]; + + dontAddPrefix=true; + + preConfigure='' + configureFlagsArray=( + -bindir $out/bin + -mandir $out/share/man + -sitelib $out/lib/ocaml/${ocaml_version}/site-lib + -config $out/etc/findlib.conf + -no-topfind + ) + ''; + + buildPhase = '' + make all + make opt + ''; + + setupHook = writeText "setupHook.sh" '' + addOCamlPath () { + if test -d "''$1/lib/ocaml/${ocaml_version}/site-lib"; then + export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/" + fi + export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" + ensureDir ''$OCAMLFIND_DESTDIR + } + + envHooks=(''${envHooks[@]} addOCamlPath) + ''; + + meta = { + homepage = http://projects.camlcity.org/projects/findlib.html; + description = "O'Caml library manager"; + license = "MIT/X11"; + }; +} diff --git a/pkgs/development/tools/ocaml/findlib/ldconf.patch b/pkgs/development/tools/ocaml/findlib/ldconf.patch new file mode 100644 index 000000000000..7718cb673925 --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/ldconf.patch @@ -0,0 +1,8 @@ +Setting paths to search for dnynmic libraries isn't very useful in Nix. + +--- findlib-1.2.6/findlib.conf.in 2010-08-17 14:50:28.000000000 -0400 ++++ findlib-1.2.6/findlib.conf.in 2010-11-24 09:46:55.179648354 -0500 +@@ -1,2 +1,3 @@ + destdir="@SITELIB@" + path="@SITELIB@" ++ldconf="ignore" |