Merge pull request #40291 from obsidiansystems/fewer-crossAttrs
misc pkgs: Fewer cross attrs
This commit is contained in:
commit
4ae207aea0
@ -15,24 +15,6 @@ with lib;
|
|||||||
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
|
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
|
||||||
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null);
|
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null);
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
configureFlagsFun = attrs: [
|
|
||||||
"--disable-oss"
|
|
||||||
"--disable-video-x11-xme"
|
|
||||||
"--enable-rpath"
|
|
||||||
# Building without this fails on Darwin with
|
|
||||||
#
|
|
||||||
# ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
|
|
||||||
# SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
|
|
||||||
#
|
|
||||||
# Please try revert the change that introduced this comment when updating SDL.
|
|
||||||
] ++ optional stdenv.isDarwin "--disable-x11-shared"
|
|
||||||
++ optional (!x11Support) "--without-x"
|
|
||||||
++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "SDL-${version}";
|
name = "SDL-${version}";
|
||||||
version = "1.2.15";
|
version = "1.2.15";
|
||||||
@ -62,11 +44,19 @@ stdenv.mkDerivation rec {
|
|||||||
++ optional (!hostPlatform.isMinGW) audiofile
|
++ optional (!hostPlatform.isMinGW) audiofile
|
||||||
++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
|
++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
|
||||||
|
|
||||||
configureFlags = configureFlagsFun { inherit alsaLib; };
|
configureFlags = [
|
||||||
|
"--disable-oss"
|
||||||
crossAttrs = {
|
"--disable-video-x11-xme"
|
||||||
configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
|
"--enable-rpath"
|
||||||
};
|
# Building without this fails on Darwin with
|
||||||
|
#
|
||||||
|
# ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
|
||||||
|
# SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
|
||||||
|
#
|
||||||
|
# Please try revert the change that introduced this comment when updating SDL.
|
||||||
|
] ++ optional stdenv.isDarwin "--disable-x11-shared"
|
||||||
|
++ optional (!x11Support) "--without-x"
|
||||||
|
++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./find-headers.patch
|
./find-headers.patch
|
||||||
|
@ -19,15 +19,6 @@ with lib;
|
|||||||
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
|
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
|
||||||
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
|
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
configureFlagsFun = attrs: [
|
|
||||||
"--disable-oss"
|
|
||||||
] ++ optional (!x11Support) "--without-x"
|
|
||||||
++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "SDL2-${version}";
|
name = "SDL2-${version}";
|
||||||
version = "2.0.8";
|
version = "2.0.8";
|
||||||
@ -61,11 +52,10 @@ stdenv.mkDerivation rec {
|
|||||||
# pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
|
# pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
|
||||||
enableParallelBuilding = false;
|
enableParallelBuilding = false;
|
||||||
|
|
||||||
configureFlags = configureFlagsFun { inherit alsaLib; };
|
configureFlags = [
|
||||||
|
"--disable-oss"
|
||||||
crossAttrs = {
|
] ++ optional (!x11Support) "--without-x"
|
||||||
configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
|
++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
|
||||||
};
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput lib/libSDL2main.a "$dev"
|
moveToOutput lib/libSDL2main.a "$dev"
|
||||||
|
@ -62,11 +62,4 @@ in stdenv.mkDerivation rec {
|
|||||||
wrapProgram "$dev/bin/freetype-config" \
|
wrapProgram "$dev/bin/freetype-config" \
|
||||||
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
|
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") {
|
|
||||||
# Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
|
|
||||||
# of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
|
|
||||||
# know why it's on the PATH.
|
|
||||||
configureFlags = "--disable-static CC_BUILD=gcc";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
|
|||||||
configureFlags = [ "--enable-install-test-programs" ]
|
configureFlags = [ "--enable-install-test-programs" ]
|
||||||
++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
|
++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
|
||||||
[ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
|
[ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
|
||||||
++ stdenv.lib.optional stdenv.isDarwin "-C";
|
++ stdenv.lib.optional stdenv.isDarwin "-C"
|
||||||
|
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-intel"
|
||||||
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
|
;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = https://dri.freedesktop.org/libdrm/;
|
homepage = https://dri.freedesktop.org/libdrm/;
|
||||||
|
@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
passthru = { inherit zlib; };
|
passthru = { inherit zlib; };
|
||||||
|
|
||||||
crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") {
|
|
||||||
propagatedBuildInputs = [];
|
|
||||||
passthru = {};
|
|
||||||
};
|
|
||||||
|
|
||||||
configureFlags = "--enable-static";
|
configureFlags = "--enable-static";
|
||||||
|
|
||||||
postInstall = ''mv "$out/bin" "$dev/bin"'';
|
postInstall = ''mv "$out/bin" "$dev/bin"'';
|
||||||
|
@ -12,22 +12,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
buildInputs = [ openssl zlib ];
|
buildInputs = [ openssl zlib ]
|
||||||
|
++ stdenv.lib.optional hostPlatform.isMinGW windows.mingw_w64;
|
||||||
crossAttrs = {
|
|
||||||
# link against cross-built libraries
|
|
||||||
configureFlags = [
|
|
||||||
"--with-openssl"
|
|
||||||
"--with-libssl-prefix=${openssl.crossDrv}"
|
|
||||||
"--with-libz"
|
|
||||||
"--with-libz-prefix=${zlib.crossDrv}"
|
|
||||||
];
|
|
||||||
} // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
|
|
||||||
# mingw needs import library of ws2_32 to build the shared library
|
|
||||||
preConfigure = ''
|
|
||||||
export LDFLAGS="-L${windows.mingw_w64}/lib $LDFLAGS"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A client-side C library implementing the SSH2 protocol";
|
description = "A client-side C library implementing the SSH2 protocol";
|
||||||
|
Loading…
Reference in New Issue
Block a user