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

Merge #12900: armv7l-linux improvements

Browse Source
This commit is contained in:
Vladimír Čunát 2016-02-15 17:14:10 +01:00
commit 5d2c5a920d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/platforms.nix
View File

@ -13,7 +13,7 @@ rec {
all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
none = []; none = [];
allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"];
x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"];
i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"];
arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ];

1
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -7,6 +7,7 @@ let
arch = arch =
if stdenv.system == "i686-linux" then "i686" if stdenv.system == "i686-linux" then "i686"
else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
else if stdenv.system == "armv7l-linux" then "armv7l"
else throw "ImageMagick is not supported on this platform."; else throw "ImageMagick is not supported on this platform.";
in in

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

@ -86,12 +86,16 @@ stdenv.mkDerivation {
# TODO: Figure out how to enable opencl without having a runtime dependency on clang # TODO: Figure out how to enable opencl without having a runtime dependency on clang
"--disable-opencl" "--disable-opencl"
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast" (if "armv7l-linux" == stdenv.system
then null
else "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast")
"--enable-shared-glapi" "--enable-shared-glapi"
"--enable-sysfs" "--enable-sysfs"
"--enable-driglx-direct" # seems enabled anyway "--enable-driglx-direct" # seems enabled anyway
"--enable-glx-tls" "--enable-glx-tls"
"--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast" (if "armv7l-linux" == stdenv.system
then "--with-dri-drivers="
else "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast")
"--with-egl-platforms=x11,wayland,drm" "--with-egl-platforms=x11,wayland,drm"
"--enable-gallium-llvm" "--enable-gallium-llvm"