pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge #12900: armv7l-linux improvements

Vladimír Čunát 5d2c5a92 bc00989c

+8 -3
+1 -1
lib/platforms.nix
··· 13 13 all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; 14 14 none = []; 15 15 allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; 16 - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; 16 + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"]; 17 17 x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; 18 18 i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; 19 19 arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
+1
pkgs/applications/graphics/ImageMagick/default.nix
··· 7 7 arch = 8 8 if stdenv.system == "i686-linux" then "i686" 9 9 else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" 10 + else if stdenv.system == "armv7l-linux" then "armv7l" 10 11 else throw "ImageMagick is not supported on this platform."; 11 12 in 12 13
+6 -2
pkgs/development/libraries/mesa/default.nix
··· 86 86 # TODO: Figure out how to enable opencl without having a runtime dependency on clang 87 87 "--disable-opencl" 88 88 89 - "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast" 89 + (if "armv7l-linux" == stdenv.system 90 + then null 91 + else "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") 90 92 "--enable-shared-glapi" 91 93 "--enable-sysfs" 92 94 "--enable-driglx-direct" # seems enabled anyway 93 95 "--enable-glx-tls" 94 - "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast" 96 + (if "armv7l-linux" == stdenv.system 97 + then "--with-dri-drivers=" 98 + else "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") 95 99 "--with-egl-platforms=x11,wayland,drm" 96 100 97 101 "--enable-gallium-llvm"