about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDario Bertini <berdario@gmail.com>2017-09-23 17:02:58 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2017-09-25 13:52:02 +0200
commitcd501e33bab4979d7e46c0eb8d5ab3adfcb64bee (patch)
treee49849d1ad592000d6f03e62a6d396a2830eac63
parent5835b1a156d5df993404205a9a4e56792da6c009 (diff)
downloadnixlib-cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee.tar
nixlib-cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee.tar.gz
nixlib-cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee.tar.bz2
nixlib-cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee.tar.lz
nixlib-cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee.tar.xz
nixlib-cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee.tar.zst
nixlib-cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee.zip
gcj: use from gcc6
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9074468095a..a39d24ae9f13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5602,8 +5602,8 @@ with pkgs;
     profiledCompiler = false;
   });
 
-  gcj = gcj49;
-  gcj49 = wrapCC (gcc49.cc.override {
+  gcj = gcj6;
+  gcj6 = wrapCC (gcc6.cc.override {
     name = "gcj";
     langJava = true;
     langFortran = false;