public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elfutils: Don't use crossAttrs

Browse Source
This commit is contained in:
John Ericson 2018-07-23 17:58:48 -04:00
parent 46b03cd5b2
commit 4116754f45
1 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/misc/elfutils/default.nix
View File

@ -28,19 +28,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
crossAttrs = {
/* Having bzip2 will harm, because anything using elfutils
as buildInput cross-building, will not be able to run 'bzip2' */
propagatedBuildInputs = [ zlib.crossDrv ];
# This program does not cross-build fine. So I only cross-build some parts # This program does not cross-build fine. So I only cross-build some parts
# I need for the linux perf tool. # I need for the linux perf tool.
# On the awful cross-building: # On the awful cross-building:
# http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005 # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
# #
# I wrote this testing for the nanonote. # I wrote this testing for the nanonote.
buildPhase = ''
buildPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
pushd libebl pushd libebl
make make
popd popd
@ -55,7 +50,7 @@ stdenv.mkDerivation rec {
popd popd
''; '';
installPhase = '' installPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
pushd libelf pushd libelf
make install make install
popd popd
@ -67,7 +62,6 @@ stdenv.mkDerivation rec {
popd popd
cp version.h $out/include cp version.h $out/include
''; '';
};
meta = { meta = {
homepage = https://sourceware.org/elfutils/; homepage = https://sourceware.org/elfutils/;