diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/expect/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 1 |
4 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 5dee1079ae27..23d57f5b6521 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; - NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; - postInstall = stdenv.lib.optionalString (libX11 != null) '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index d9f9b09271b5..885fd040e47d 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, tcl, tk, xproto, libX11}: +{ stdenv, fetchurl, tcl }: +let version = "5.45"; +in stdenv.mkDerivation { - name = "expect-5.44.1"; + name = "expect-${version}"; src = fetchurl { - url = http://expect.nist.gov/old/expect-5.44.1.tar.gz; - sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4"; + url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; + sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; }; - buildInputs = [tcl tk xproto libX11]; + buildInputs = [ tcl ]; #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H"; @@ -23,14 +25,17 @@ stdenv.mkDerivation { export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" ''; - configureFlags = ["--with-tcl=${tcl}/lib" + configureFlags = [ + "--with-tcl=${tcl}/lib" "--with-tclinclude=${tcl}/include" - "--with-tk=${tk}/lib" - "--exec-prefix=$out"]; + "--exec-prefix=$out" + ]; + + postInstall = let libSuff = if stdenv.isDarwin then "dylib" else "so"; + in "cp expect $out/bin; mkdir -p $out/lib; cp *.${libSuff} $out/lib"; meta = { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; }; - postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib"; } diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 69c7b77e3f90..81bf7c908eff 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; + configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 540ab07c286b..f119dbd1e4a1 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -37,7 +37,6 @@ rec { sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \ |