Merge branch 'master' into staging-next

2019-11-11 22:27:57 +01:00
parent cf27abf534 9fe897c1ec
commit 1b5a8a2cc6
34 changed files with 354 additions and 253 deletions
@@ -1,4 +1,5 @@
 { stdenv,
+  mkDerivation,
  cmake,
  elfutils,
  extra-cmake-modules,
@@ -14,7 +15,7 @@
  threadweaver,
 }:

-stdenv.mkDerivation rec {
+mkDerivation rec {
  pname = "hotspot";
  version = "1.2.0";