diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 12:43:37 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 12:43:37 +0300 |
commit | d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41 (patch) | |
tree | 3fd2e86b20f4251fa91ace5efb393ee66700fbb8 /pkgs/applications/science | |
parent | e6f1028340d7ab1c485efccbbbbaec4b9cb5712a (diff) | |
parent | 03fb2c1f32825dd7d43a456667db5848b47f4ea3 (diff) | |
download | nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.gz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.bz2 nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.lz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.xz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.zst nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.zip |
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/electronics/tkgate/1.x.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/calc/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 61d03173e0ba..2a3f17b670b4 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i config.h \ -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \ - -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \ - -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \ + -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11.dev}/include"|' \ + -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11.out}/lib"|' \ \ -e '20 i #define TCL_LIBRARY "${tcl}/lib"' \ -e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \ diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 8673d7debd9d..b9db4174c094 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let makeFlags = '' - INCDIR=${glibc}/include \ + INCDIR=${glibc.dev}/include \ BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \ USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \ TERMCONTROL=-DUSE_TERMIOS \ |