swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #126727 from zhaofengli/riscv-mesa

Browse source 
mesa: Enable riscv64-linux
This commit is contained in:
John Ericson 2021-06-13 10:24:15 -04:00 committed by GitHub
parent e0285f7892 f885e987ef
commit 3553c3bc79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/systems/doubles.nix
View file

@ -96,5 +96,5 @@ in {
embedded = filterDoubles predicates.isNone;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin"];
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"];
}

2
pkgs/applications/networking/mailreaders/claws-mail/default.nix
View file

@ -21,7 +21,7 @@
, enableLdap ? true, openldap
, enableNetworkManager ? true, networkmanager
, enableLibetpan ? true, libetpan
, enableValgrind ? true, valgrind
, enableValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind
, enableSvg ? true, librsvg
# Configure claws-mail's plugins

2
pkgs/development/interpreters/php/generic.nix
View file

@ -28,7 +28,7 @@ let
, embedSupport ? false
, ipv6Support ? true
, systemdSupport ? stdenv.isLinux
, valgrindSupport ? !stdenv.isDarwin
, valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
, ztsSupport ? apxs2Support
}@args:

8
pkgs/development/libraries/libpsl/default.nix
View file

@ -14,7 +14,9 @@
, publicsuffix-list
}:
stdenv.mkDerivation rec {
let
enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind;
in stdenv.mkDerivation rec {
pname = "libpsl";
version = "0.21.0";
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
pkg-config
python3
libxslt
] ++ lib.optionals (!stdenv.isDarwin) [
] ++ lib.optionals enableValgrindTests [
valgrind
];
@ -60,7 +62,7 @@ stdenv.mkDerivation rec {
"--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
"--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
"--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
] ++ lib.optionals (!stdenv.isDarwin) [
] ++ lib.optionals enableValgrindTests [
"--enable-valgrind-tests"
];

7
pkgs/development/libraries/mesa/default.nix
View file

@ -10,7 +10,7 @@
, vulkanDrivers ? ["auto"]
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
, OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
, withValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light
, enableGalliumNine ? stdenv.isLinux
, enableOSMesa ? stdenv.isLinux
}:
@ -64,6 +64,11 @@ self = stdenv.mkDerivation {
url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
})
(fetchpatch {
name = "add-riscv-default-selections.patch";
url = "https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11346.patch";
sha256 = "1nwqslr1g6m83i0r40710havkyf03yxkgaiwgxz2zlw2xkbrnzw0";
})
] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [
# Fix aarch64-darwin build, remove when upstreaam supports it out of the box.
# See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020

2
pkgs/top-level/php-packages.nix
View file

@ -364,7 +364,7 @@ lib.makeScope pkgs.newScope (self: with self; {
# oci8 (7.4, 7.3, 7.2)
# odbc (7.4, 7.3, 7.2)
{ name = "opcache";
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [
buildInputs = [ pcre2 ] ++ lib.optionals (lib.versionAtLeast php.version "8.0" && !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) [
valgrind.dev
];
patches = lib.optionals (lib.versionOlder php.version "7.4") [