Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/applications/science/electronics/fritzing/default.nix

@@ -17,9 +17,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase qtsvg boost ];
 
   configurePhase = ''
+    runHook preConfigure
     cd fritzing-${version}.source
     echo $PATH
     qmake PREFIX=$out phoenix.pro
+    runHook postConfigure
   '';
 
   meta = {

pkgs/applications/science/electronics/tkgate/1.x.nix

@@ -1,8 +1,8 @@
 { stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }:
 
 let
-  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
-  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
+  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include";
+  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib";
 in
 stdenv.mkDerivation rec {
   name = "tkgate-1.8.7";