mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-26 21:42:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix javafx on mac osx new m1 arch (#3041)

Browse source
This commit is contained in:
Chris Stewart 2021-05-05 13:08:09 -05:00 • committed by GitHub
parent 63a6f9309d
commit b854f7b16a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
project/Deps.scala
View file

@ -100,13 +100,20 @@ object Deps {
val scalaFx =
"org.scalafx" %% "scalafx" % V.scalaFxV withSources () withJavadoc ()
lazy val arch = System.getProperty("os.arch")
lazy val osName = System.getProperty("os.name") match {
case n if n.startsWith("Linux") => "linux"
case n if n.startsWith("Mac") => "mac"
case n if n.startsWith("Mac") =>
if (arch == "aarch64" ) {
//needed to accommodate the different chip
//arch for M1
s"mac-${arch}"
} else {
"mac"
}
case n if n.startsWith("Windows") => "win"
case _ => throw new Exception("Unknown platform!")
case x => throw new Exception(s"Unknown platform $x!")
}
// Not sure if all of these are needed, some might be possible to remove
lazy val javaFxBase =
"org.openjfx" % s"javafx-base" % V.javaFxV classifier osName withSources () withJavadoc ()