diff options
| -rw-r--r-- | pkgs/applications/misc/hello/ex-2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/separate-debug-info.sh | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index bb91c90e2fcf..bf63df4d154e 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { doCheck = false; - separateDebugInfo = true; - meta = { description = "A program that produces a familiar, friendly greeting"; longDescription = '' diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 636918992090..317f13beffdd 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -18,7 +18,6 @@ _separateDebugInfo() { # Skip non-ELF files. exec 10< "$i" read -n 4 -u 10 magic - if [[ "$magic" =~ ELF ]]; then echo FOO; fi exec 10<&- # Extract the Build ID. FIXME: there's probably a cleaner way. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 778b3365b478..246ca3696d58 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -138,7 +138,7 @@ let outputs' = outputs ++ - (if separateDebugInfo then [ "debug" ] else []); + (if separateDebugInfo then assert result.isLinux; [ "debug" ] else []); buildInputs' = buildInputs ++ (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []); diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8a301f912b81..71c47c97d602 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -43,8 +43,6 @@ let doInstallCheck = false; - separateDebugInfo = true; - crossAttrs = { postUnpack = '' export CPATH="${bzip2.crossDrv}/include" |