Merge pull request #258073 from hraban/fix/clisp-x86-darwin
clisp: disable unsupported modules on x86_64-darwin
This commit is contained in:
commit
69a3d7e4b3
@ -25,8 +25,8 @@
|
|||||||
, xorgproto
|
, xorgproto
|
||||||
, coreutils
|
, coreutils
|
||||||
# build options
|
# build options
|
||||||
, threadSupport ? stdenv.hostPlatform.isx86
|
, threadSupport ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin)
|
||||||
, x11Support ? stdenv.hostPlatform.isx86
|
, x11Support ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin)
|
||||||
, dllSupport ? true
|
, dllSupport ? true
|
||||||
, withModules ? [
|
, withModules ? [
|
||||||
"pcre"
|
"pcre"
|
||||||
@ -82,13 +82,16 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = lib.optionalString stdenv.isDarwin (''
|
preConfigure = lib.optionalString stdenv.isDarwin (''
|
||||||
|
(
|
||||||
cd src
|
cd src
|
||||||
autoreconf -f -i -I m4 -I glm4
|
autoreconf -f -i -I m4 -I glm4
|
||||||
cd -
|
)
|
||||||
'' + lib.concatMapStrings (x: ''
|
'' + lib.concatMapStrings (x: ''
|
||||||
|
(
|
||||||
|
root="$PWD"
|
||||||
cd modules/${x}
|
cd modules/${x}
|
||||||
autoreconf -f -i -I ../../src -I ../../src/m4 -I ../../src/glm4
|
autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4"
|
||||||
cd -
|
)
|
||||||
'') withModules);
|
'') withModules);
|
||||||
|
|
||||||
configureFlags = [ "builddir" ]
|
configureFlags = [ "builddir" ]
|
||||||
|
Loading…
Reference in New Issue
Block a user