diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-18 13:00:40 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-18 13:49:22 +0000 |
| commit | d020caa5b2eca90ea051403fbb4c52b99ee071b9 (patch) | |
| tree | ba44ef1e784bca89e0df6b249956fd035b1d86e3 /pkgs/applications/science/electronics | |
| parent | 3e68106afd95df012ddb548575f0133681687a90 (diff) | |
| parent | 0729f606973870c03d21bb2f21b70d91216943ca (diff) | |
| download | nixlib-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar nixlib-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.gz nixlib-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.bz2 nixlib-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.lz nixlib-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.xz nixlib-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.zst nixlib-d020caa5b2eca90ea051403fbb4c52b99ee071b9.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/science/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/fritzing/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/tkgate/1.x.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 302c6a318e65..ff0502ac0cbb 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/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 = { diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index e9849d0460c8..c62ecdcd1e2a 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/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"; |