diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-01-03 18:18:42 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-01-03 18:18:42 +0100 |
| commit | 840f9b419c76456656f747cc7f3153278d8b74a6 (patch) | |
| tree | aac4f676862e51e7fff2ef3d7cd86ced67811d24 /pkgs | |
| parent | 772cff097ee40353f703d64ab49df0eeb309b2c4 (diff) | |
| download | nixpkgs-840f9b419c76456656f747cc7f3153278d8b74a6.tar nixpkgs-840f9b419c76456656f747cc7f3153278d8b74a6.tar.gz nixpkgs-840f9b419c76456656f747cc7f3153278d8b74a6.tar.bz2 nixpkgs-840f9b419c76456656f747cc7f3153278d8b74a6.tar.lz nixpkgs-840f9b419c76456656f747cc7f3153278d8b74a6.tar.xz nixpkgs-840f9b419c76456656f747cc7f3153278d8b74a6.tar.zst nixpkgs-840f9b419c76456656f747cc7f3153278d8b74a6.zip | |
glib-tested: Remove explicitly adding libgcc_s.so.
As of 65221567c12eb20d1254f6bc1b573e126af43645, 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>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ab6f4165e72..2868e1de4f7 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -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" |