b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

glib-tested: Remove explicitly adding libgcc_s.so.

Browse source 
As of 65221567c1, it's no longer needed.

Also, this is one of the packages that has caused the tarball evaluation
to fail for freebsd targets, so I guess it's twice a reason to remove
it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-01-03 18:18:42 +01:00
parent 772cff097e
commit 840f9b419c
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/glib/default.nix
View file

@ -81,9 +81,7 @@ stdenv.mkDerivation rec {
inherit doCheck;
preCheck = optionalString doCheck
# libgcc_s.so.1 must be installed for pthread_cancel to work
# also point to the glib/.libs path
'' export LD_LIBRARY_PATH="${stdenv.cc.gcc}/lib:$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
'' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo"
export XDG_CACHE_HOME="$TMP"
export XDG_RUNTIME_HOME="$TMP"