mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 22:32:58 +03: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
@ -31,6 +31,10 @@ stdenv.mkDerivation {
|
|||||||
--set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\;
|
--set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\;
|
||||||
" else "";
|
" 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,
|
# The binaries for Darwin use frameworks, so fake those frameworks,
|
||||||
# and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
|
# and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
|
||||||
# that the executables work with no special setup.
|
# that the executables work with no special setup.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
let {
|
let
|
||||||
|
|
||||||
allPackages = import ./all-packages.nix;
|
allPackages = import ./all-packages.nix;
|
||||||
|
|
||||||
@ -62,7 +62,6 @@ let {
|
|||||||
gcc42
|
gcc42
|
||||||
gdb
|
gdb
|
||||||
ghc
|
ghc
|
||||||
ghc68
|
|
||||||
ghostscript
|
ghostscript
|
||||||
gimp
|
gimp
|
||||||
gnugrep
|
gnugrep
|
||||||
@ -296,12 +295,11 @@ let {
|
|||||||
ncurses
|
ncurses
|
||||||
;};
|
;};
|
||||||
|
|
||||||
body = [
|
in [
|
||||||
i686LinuxPkgs
|
i686LinuxPkgs
|
||||||
x86_64LinuxPkgs
|
x86_64LinuxPkgs
|
||||||
i686FreeBSDPkgs
|
i686FreeBSDPkgs
|
||||||
powerpcDarwinPkgs
|
powerpcDarwinPkgs
|
||||||
i686DarwinPkgs
|
i686DarwinPkgs
|
||||||
cygwinPkgs
|
cygwinPkgs
|
||||||
];
|
]
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user