From 2021578686790d2c733eb1fa9c2034826996b176 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 13 Sep 2019 15:34:50 -0400 Subject: [PATCH] =?UTF-8?q?ghc:=20don=E2=80=99t=20use=20dwarf=20on=20windo?= =?UTF-8?q?ws?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit elfutils don’t work on windows https://hydra.nixos.org/eval/1541857#tabs-removed /cc @domenkozar --- pkgs/development/compilers/ghc/8.2.2.nix | 3 ++- pkgs/development/compilers/ghc/8.4.4.nix | 3 ++- pkgs/development/compilers/ghc/8.6.4.nix | 3 ++- pkgs/development/compilers/ghc/8.6.5.nix | 3 ++- pkgs/development/compilers/ghc/8.8.1.nix | 3 ++- pkgs/development/compilers/ghc/head.nix | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 7c13db74c4c..2e500db536c 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,7 +8,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 30353771ea6..2fbdff865ed 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 7b6769df682..151e80198f4 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , # GHC can be built with system libffi or a bundled one. libffi ? null diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index acc97f93c63..0a218c29264 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , # GHC can be built with system libffi or a bundled one. libffi ? null diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index c80ccf72817..3783b97795a 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , # GHC can be built with system libffi or a bundled one. libffi ? null diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 240b55deb68..cbc404de862 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for