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

separateDebugInfo: Assert Linux

Browse Source 
Also remove some unintended setting of separateDebugInfo.
This commit is contained in:
Eelco Dolstra 2015-09-22 20:21:10 +02:00
parent f9d1c58f20
commit 2a28bc6691
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/hello/ex-2/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
separateDebugInfo = true;
meta = { meta = {
description = "A program that produces a familiar, friendly greeting"; description = "A program that produces a familiar, friendly greeting";
longDescription = '' longDescription = ''

1
pkgs/build-support/setup-hooks/separate-debug-info.sh
View File

@ -18,7 +18,6 @@ _separateDebugInfo() {
# Skip non-ELF files. # Skip non-ELF files.
exec 10< "$i" exec 10< "$i"
read -n 4 -u 10 magic read -n 4 -u 10 magic
if [[ "$magic" =~ ELF ]]; then echo FOO; fi
exec 10<&- exec 10<&-
# Extract the Build ID. FIXME: there's probably a cleaner way. # Extract the Build ID. FIXME: there's probably a cleaner way.

2
pkgs/stdenv/generic/default.nix
View File

@ -138,7 +138,7 @@ let
outputs' = outputs' =
outputs ++ outputs ++
(if separateDebugInfo then [ "debug" ] else []); (if separateDebugInfo then assert result.isLinux; [ "debug" ] else []);
buildInputs' = buildInputs ++ buildInputs' = buildInputs ++
(if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []); (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []);

2
pkgs/tools/package-management/nix/default.nix
View File

@ -43,8 +43,6 @@ let
doInstallCheck = false; doInstallCheck = false;
separateDebugInfo = true;
crossAttrs = { crossAttrs = {
postUnpack = postUnpack =
'' export CPATH="${bzip2.crossDrv}/include" '' export CPATH="${bzip2.crossDrv}/include"