public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61168 from matthewbauer/release-cross-fixes

Browse Source 
release-cross.nix changes/fixes
This commit is contained in:
Matthew Bauer 2019-06-03 20:13:43 -04:00 committed by GitHub
commit dc42372809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/mesa/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook , pkgconfig, intltool, autoreconfHook
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, valgrind-light, python2, python2Packages , libelf, libvdpau, python2, python2Packages
, libglvnd , libglvnd
, enableRadv ? true , enableRadv ? true
, galliumDrivers ? null , galliumDrivers ? null
@ -10,6 +10,7 @@
, vulkanDrivers ? null , vulkanDrivers ? null
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, OpenGL, Xplugin , OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
}: }:
/** Packaging design: /** Packaging design:
@ -25,10 +26,6 @@
with stdenv.lib; with stdenv.lib;
if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
throw "${stdenv.system}: unsupported platform for Mesa"
else
let let
# platforms that have PCIe slots and thus can use most non-integrated GPUs # platforms that have PCIe slots and thus can use most non-integrated GPUs
pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64; pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64;
@ -150,7 +147,8 @@ let self = stdenv.mkDerivation {
libffi libvdpau libelf libXvMC libffi libvdpau libelf libXvMC
libpthreadstubs openssl /*or another sha1 provider*/ libpthreadstubs openssl /*or another sha1 provider*/
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
++ lib.optional withValgrind valgrind-light;
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; doCheck = false;
@ -273,7 +271,7 @@ let self = stdenv.mkDerivation {
description = "An open source implementation of OpenGL"; description = "An open source implementation of OpenGL";
homepage = https://www.mesa3d.org/; homepage = https://www.mesa3d.org/;
license = licenses.mit; # X11 variant, in most files license = licenses.mit; # X11 variant, in most files
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ vcunat ]; maintainers = with maintainers; [ vcunat ];
}; };
}; };

2
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@ -26,7 +26,7 @@ let
# Determine the Android os identifier from Nix's system identifier # Determine the Android os identifier from Nix's system identifier
os = if stdenv.system == "x86_64-linux" then "linux" os = if stdenv.system == "x86_64-linux" then "linux"
else if stdenv.system == "x86_64-darwin" then "macosx" else if stdenv.system == "x86_64-darwin" then "macosx"
else throw "No tarballs found for system architecture: ${stdenv.system}"; else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}";
# Generated Nix packages # Generated Nix packages
packages = import ./generated/packages.nix { packages = import ./generated/packages.nix {

2
pkgs/os-specific/linux/busybox/default.nix
View File

@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/release-cross.nix
View File

@ -107,7 +107,6 @@ in
mapTestEqual = lib.mapAttrsRecursive testEqual; mapTestEqual = lib.mapAttrsRecursive testEqual;
in mapTestEqual { in mapTestEqual {
androidndk = nativePlatforms;
boehmgc = nativePlatforms; boehmgc = nativePlatforms;
libffi = nativePlatforms; libffi = nativePlatforms;
libiconv = nativePlatforms; libiconv = nativePlatforms;