diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 20:13:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-03 20:13:43 -0400 |
commit | dc423728091b9b4a9b16e6b54e13721ab16e5d18 (patch) | |
tree | fd1ad53c902004ad6571b46695c0c34aa75e68b5 | |
parent | 84e34cbde2ea8dfcb2e853a61c5e7c5b39413525 (diff) | |
parent | 872100cf4129758917dfef9c0ebe4d8e9fa1ce28 (diff) | |
download | nixpkgs-dc423728091b9b4a9b16e6b54e13721ab16e5d18.tar nixpkgs-dc423728091b9b4a9b16e6b54e13721ab16e5d18.tar.gz nixpkgs-dc423728091b9b4a9b16e6b54e13721ab16e5d18.tar.bz2 nixpkgs-dc423728091b9b4a9b16e6b54e13721ab16e5d18.tar.lz nixpkgs-dc423728091b9b4a9b16e6b54e13721ab16e5d18.tar.xz nixpkgs-dc423728091b9b4a9b16e6b54e13721ab16e5d18.tar.zst nixpkgs-dc423728091b9b4a9b16e6b54e13721ab16e5d18.zip |
Merge pull request #61168 from matthewbauer/release-cross-fixes
release-cross.nix changes/fixes
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/compose-android-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release-cross.nix | 1 |
4 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b1520de4fd6..e68e1b572ee 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: @@ -25,10 +26,6 @@ with stdenv.lib; -if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then - throw "${stdenv.system}: unsupported platform for Mesa" -else - let # platforms that have PCIe slots and thus can use most non-integrated GPUs pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64; @@ -150,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; @@ -273,7 +271,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 ]; }; }; 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 { 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; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 339973f0574..bc822b466c9 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; |