diff options
| -rw-r--r-- | lib/platforms.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/lib/platforms.nix b/lib/platforms.nix index 750829da3751..5ac0b5287145 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -13,7 +13,7 @@ rec { all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; none = []; 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"]; i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8fa86041414f..e75e86a4d533 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -7,6 +7,7 @@ let arch = 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 == "armv7l-linux" then "armv7l" else throw "ImageMagick is not supported on this platform."; in diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c6af00d08b87..f2b53fc2e595 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -86,12 +86,16 @@ stdenv.mkDerivation { # TODO: Figure out how to enable opencl without having a runtime dependency on clang "--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-sysfs" "--enable-driglx-direct" # seems enabled anyway "--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" "--enable-gallium-llvm" |