diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
| commit | b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1 (patch) | |
| tree | 1665938bf023545db2afcf42d924a47d7f2918b2 /pkgs/development/compilers | |
| parent | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (diff) | |
| parent | c860babfe6a512aa7c7e83751547347a137ecd67 (diff) | |
| download | nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.gz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.bz2 nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.lz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.xz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.zst nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/chez/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ecl/16.1.2.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 12d68f0265c..a0fc30c8586 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation"; /* ** We patch out a very annoying 'feature' in ./configure, which diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index c27f2a22670..bede9fa4aa6 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation { description = "Lisp implementation aiming to be small, fast and easy to embed"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } |