diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-15 17:14:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-15 17:14:10 +0100 |
| commit | 5d2c5a920d1bb20f1f0b7f4092db87b5d735c918 (patch) | |
| tree | 3c1e4589bd82efd3f174c7c52fae6504c85786b7 /pkgs | |
| parent | bc00989ca54f94bb9cef0ed731f11a3f35f80fe2 (diff) | |
| parent | 6c532624808336b853f31d27ef3309e6feab4ac1 (diff) | |
| download | nixlib-5d2c5a920d1bb20f1f0b7f4092db87b5d735c918.tar nixlib-5d2c5a920d1bb20f1f0b7f4092db87b5d735c918.tar.gz nixlib-5d2c5a920d1bb20f1f0b7f4092db87b5d735c918.tar.bz2 nixlib-5d2c5a920d1bb20f1f0b7f4092db87b5d735c918.tar.lz nixlib-5d2c5a920d1bb20f1f0b7f4092db87b5d735c918.tar.xz nixlib-5d2c5a920d1bb20f1f0b7f4092db87b5d735c918.tar.zst nixlib-5d2c5a920d1bb20f1f0b7f4092db87b5d735c918.zip | |
Merge #12900: armv7l-linux improvements
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 8 |
2 files changed, 7 insertions, 2 deletions
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" |