mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
* ghcboot was broken: the combination of patchelf and strip -S generates
broken binaries (NIXPKGS-85). Worked around by not stripping. svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10831
This commit is contained in:
parent
212148ec84
commit
3e72751bd9
2 changed files with 13 additions and 11 deletions
|
@ -31,6 +31,10 @@ stdenv.mkDerivation {
|
|||
--set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\;
|
||||
" else "";
|
||||
|
||||
# Stripping combined with patchelf breaks the executables (they die
|
||||
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
|
||||
dontStrip = true;
|
||||
|
||||
# The binaries for Darwin use frameworks, so fake those frameworks,
|
||||
# and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
|
||||
# that the executables work with no special setup.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
let {
|
||||
let
|
||||
|
||||
allPackages = import ./all-packages.nix;
|
||||
|
||||
|
@ -62,7 +62,6 @@ let {
|
|||
gcc42
|
||||
gdb
|
||||
ghc
|
||||
ghc68
|
||||
ghostscript
|
||||
gimp
|
||||
gnugrep
|
||||
|
@ -296,12 +295,11 @@ let {
|
|||
ncurses
|
||||
;};
|
||||
|
||||
body = [
|
||||
i686LinuxPkgs
|
||||
x86_64LinuxPkgs
|
||||
i686FreeBSDPkgs
|
||||
powerpcDarwinPkgs
|
||||
i686DarwinPkgs
|
||||
cygwinPkgs
|
||||
];
|
||||
}
|
||||
in [
|
||||
i686LinuxPkgs
|
||||
x86_64LinuxPkgs
|
||||
i686FreeBSDPkgs
|
||||
powerpcDarwinPkgs
|
||||
i686DarwinPkgs
|
||||
cygwinPkgs
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue