From 1671eeda2d5c14f44052d8938130f8959d1f0b42 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 8 May 2019 21:44:46 -0400 Subject: [PATCH 1/5] release-cross: remove androidndk It is no longer provided --- pkgs/top-level/release-cross.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index acccd155e08..2640cade2e5 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -107,7 +107,6 @@ in mapTestEqual = lib.mapAttrsRecursive testEqual; in mapTestEqual { - androidndk = nativePlatforms; boehmgc = nativePlatforms; libffi = nativePlatforms; libiconv = nativePlatforms; From 4acc4348476faf5f9c93429e561c3d99024239d9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 8 May 2019 21:45:33 -0400 Subject: [PATCH 2/5] androidenv: add more context to os not found error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t have android sdk available for aarch64, so this error happens a lot. Adding some context on what is going on makes this clearer. --- pkgs/development/mobile/androidenv/compose-android-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 935a4a4f2fb..40b2ed775cd 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -26,7 +26,7 @@ let # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" 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 packages = import ./generated/packages.nix { From 922589053724885437b2c75257ab36383f95c378 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 8 May 2019 21:46:31 -0400 Subject: [PATCH 3/5] mesa: use platforms instead of throw mesaPlatforms can be used in the platforms attr. --- pkgs/development/libraries/mesa/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c9ce97849e1..05c5116a01d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -25,10 +25,6 @@ with stdenv.lib; -if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then - throw "unsupported platform for Mesa" -else - let defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) @@ -273,7 +269,7 @@ let self = stdenv.mkDerivation { description = "An open source implementation of OpenGL"; homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ vcunat ]; }; }; From 476c580605c071cbadbd8715984b7da08f58d303 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 8 May 2019 21:47:11 -0400 Subject: [PATCH 4/5] =?UTF-8?q?mesa:=20don=E2=80=99t=20use=20valgrind-ligh?= =?UTF-8?q?t=20on=20aarch32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit valgrind-light doesn’t appear to work correctly on aarch32. It’s also not a required dependency on mesa, so in the future we may be able to disable it for other platforms --- pkgs/development/libraries/mesa/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 05c5116a01d..79947ae2f15 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, valgrind-light, python2, python2Packages +, libelf, libvdpau, python2, python2Packages , libglvnd , enableRadv ? true , galliumDrivers ? null @@ -10,6 +10,7 @@ , vulkanDrivers ? null , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin +, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light }: /** Packaging design: @@ -146,7 +147,8 @@ let self = stdenv.mkDerivation { libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ ] ++ 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; doCheck = false; From dbd1a4481fca373b4a13d052c7c45075d8d5f143 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 8 May 2019 21:54:27 -0400 Subject: [PATCH 5/5] busybox: only use stdenv.cc.libc.static when it exists causes on evaluation error on macOS otherwise --- pkgs/os-specific/linux/busybox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a0f0a4c47e3..7270877c52e 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { 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;