Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
@@ -10,6 +10,8 @@
|
||||
, debugDeveloper ? false
|
||||
, optimizationsDeveloper ? true
|
||||
, extraWarningsDeveloper ? false
|
||||
# Darwin frameworks
|
||||
, Cocoa
|
||||
# Inherit generics
|
||||
, branch, sha256, version, ...
|
||||
}:
|
||||
@@ -145,7 +147,8 @@ stdenv.mkDerivation rec {
|
||||
] ++ optional openglSupport mesa
|
||||
++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin
|
||||
++ optional (isLinux || isFreeBSD) libva
|
||||
++ optional isLinux alsaLib;
|
||||
++ optional isLinux alsaLib
|
||||
++ optional isDarwin Cocoa;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user