diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
commit | 52d9c93abef582cfa32d94397aa86f0aa169917c (patch) | |
tree | fd32d1eb551687c92a10487a0a877018791b73ff /pkgs/development/compilers/go/1.3.nix | |
parent | 629f7d055a8ec6815400affbfdd0a9f3384b0e2a (diff) | |
parent | 777617f987c1e3e44f0f399582bc1b2e2f113c42 (diff) | |
download | nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.gz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.bz2 nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.lz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.xz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.zst nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.zip |
Merge 'staging' into master
Diffstat (limited to 'pkgs/development/compilers/go/1.3.nix')
-rw-r--r-- | pkgs/development/compilers/go/1.3.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index b9178d5e61c..fafa045e562 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work" # during tests: - export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so))" + export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib/libgcc_s.so))" mkdir -p "$out/bin" export GOROOT="$(pwd)/" |