Merge branch 'master' into staging

* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
This commit is contained in:
Orivej Desh
2017-10-03 17:46:39 +00:00
88 changed files with 1417 additions and 656 deletions
+7 -3
View File
@@ -9,10 +9,14 @@ stdenv.mkDerivation {
buildInputs = [ cmake python ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=OFF"
makeFlags = [
# let intermediate tools find intermediate library
"LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(CURDIR)/src"
];
# Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools".
enableParallelBuilding = false;
meta = with stdenv.lib; {
homepage = https://github.com/BYVoid/OpenCC;
license = licenses.asl20;
@@ -23,7 +27,7 @@ stdenv.mkDerivation {
phrase-level conversion, variant conversion and regional idioms among Mainland China,
Taiwan and Hong kong.
'';
maintainers = [ maintainers.mingchuan ];
maintainers = [ maintainers.sifmelcara ];
platforms = platforms.linux;
};
}