diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 23:25:18 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 23:25:18 +0200 |
| commit | e68505e7355b0a76caac43783f59fae6474073dc (patch) | |
| tree | 4b59b8084e24e6ffe538c5f2f9697fb7c80b2ad0 /pkgs/development/compilers | |
| parent | 9894a70299497ee1d2bb746374d986e8d0f771e3 (diff) | |
| parent | 8a999d15ebfb929a5f5fc5b08be6a23848f29710 (diff) | |
| download | nixlib-e68505e7355b0a76caac43783f59fae6474073dc.tar nixlib-e68505e7355b0a76caac43783f59fae6474073dc.tar.gz nixlib-e68505e7355b0a76caac43783f59fae6474073dc.tar.bz2 nixlib-e68505e7355b0a76caac43783f59fae6474073dc.tar.lz nixlib-e68505e7355b0a76caac43783f59fae6474073dc.tar.xz nixlib-e68505e7355b0a76caac43783f59fae6474073dc.tar.zst nixlib-e68505e7355b0a76caac43783f59fae6474073dc.zip | |
Merge remote-tracking branch 'upstream/gcc8' into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/8/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/iasl/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/nasm/default.nix | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index f5572c077f31..129ca72251fc 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -373,6 +373,9 @@ stdenv.mkDerivation ({ stdenv.lib.platforms.freebsd ++ stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.darwin; + + # See #40038 + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index b1b31aecae13..ab9fd23f5088 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bison, flex}: +{stdenv, fetchurl, fetchpatch, bison, flex}: stdenv.mkDerivation rec { pname = "iasl"; @@ -9,12 +9,20 @@ stdenv.mkDerivation rec { sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w"; }; - NIX_CFLAGS_COMPILE = "-O3"; + NIX_CFLAGS_COMPILE = [ + "-O3" + ]; buildFlags = "iasl"; buildInputs = [ bison flex ]; + patches = fetchpatch { + /* https://github.com/acpica/acpica/pull/389 */ + url = "https://github.com/acpica/acpica/commit/935ca65f7806a3ef9bd02a947e50f3a1f586ac67.patch"; + sha256 = "0jz4bakifphm425shbd1j99hldgy71m7scl8mwibm441d56l3ydf"; + }; + installPhase = '' install -d $out/bin diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8d92bc4eba2f..f5645ae02192 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { make golden && make test ''; + NIX_CFLAGS_COMPILE="-Wno-error=attributes"; + meta = with stdenv.lib; { homepage = https://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; |