Commit Graph

394 Commits

Author SHA1 Message Date
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Michael Weiss
16cf68dc7a
mesa: 20.3.1 -> 20.3.2 (#108152)
This also applies the macOS patch unconditionally to avoid breakages in
the future.
2021-01-01 20:08:54 +01:00
Ryan Burns
7115040e19 mesa: fix build on darwin
Latest mesa requires macOS SDK 10.13 - this applies an upstream
patch for compatibility with 10.13

Applied on darwin only to avoid linux rebuilds in staging-next - left a
note that this can be done unconditionally as it has no effect on
non-darwin platforms, if this would be considered more robust.
2020-12-31 09:11:38 +01:00
Michael Weiss
af9f917ce1
mesa: 20.3.0 -> 20.3.1 2020-12-17 12:01:08 +01:00
Michael Weiss
3106113c9e
mesa: Drop all old patches
There's no need to keep the expressions for old patches around.
Also: Apply the musl patch unconditionally to ensure that it doesn't
break after future updates.
2020-12-17 12:01:03 +01:00
Michael Weiss
a9385a730b
mesa: 20.2.4 -> 20.3.0 2020-12-17 11:51:02 +01:00
Vladimír Čunát
37dfd61f02
mesa: fix musl-specific patching
When updating to 20.2, this was apparently forgotten.
2020-12-13 11:36:18 +01:00
Vladimír Čunát
e955c4315f
Merge #106804: mesa: find prefixed nm when cross compiling 2020-12-13 11:06:17 +01:00
Atemu
01698009ac mesa: find prefixed nm when cross compiling 2020-12-13 08:08:02 +01:00
Michael Weiss
8c19846912
mesa: 20.2.3 -> 20.2.4 (#105959) 2020-12-05 13:26:32 +01:00
Michael Weiss
f2ff3a7867
mesa: 20.2.2 -> 20.2.3 (#104789) 2020-11-25 12:23:02 +01:00
Michael Weiss
971aef5e08
mesa: 20.2.1 -> 20.2.2 (#103174) 2020-11-09 10:59:34 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Andreas Rammhold
250fb4611f
Merge pull request #100456 from maralorn/boolToString
treewide: De-inline uses of lib.boolToString
2020-10-25 00:45:11 +02:00
Michael Weiss
b13615663c
mesa: 20.1.9 -> 20.2.1 (#99091)
Announcements:
- https://docs.mesa3d.org/relnotes/20.2.0.html
- https://docs.mesa3d.org/relnotes/20.2.1.html

I've rebased the patches accordingly and avoided:
meson.build:320: WARNING: Platform `surfaceless` is now always selected; setting this option will be an error in Mesa 20.3
meson.build:324: WARNING: Platform `drm` is now automatically selected; setting this option will be an error in Mesa 20.3
This will also fix the list in the configuration summary:
EGL/Vulkan/VL platforms:   x11 surfaceless wayland drm surfaceless drm
2020-10-15 16:08:01 +02:00
Malte Brandy
cebf9198f3
treewide: De-inline uses of lib.boolToString
This commit should not change eval results
2020-10-14 01:46:17 +02:00
Michael Weiss
e991a1ea1f
mesa: 20.1.8 -> 20.1.9 (#99291) 2020-10-01 17:58:27 +02:00
Michael Weiss
6343fb95c6
mesa: 20.1.7 -> 20.1.8 (#98154) 2020-09-17 14:24:33 +02:00
Michael Weiss
5f29a2b2ee mesa: 20.1.6 -> 20.1.7 2020-09-04 20:00:58 +02:00
Pierre Bourdon
0b11b757ed
mesa: use the default patchelf now that it is up to date 2020-08-28 02:39:14 +02:00
Michael Weiss
d7e7aaa9b6
mesa: 20.1.5 -> 20.1.6 (#95859) 2020-08-20 22:29:36 +02:00
Michael Weiss
dfbda2135c
Merge pull request #89657 from primeos/mesa-DriConf-fix
mesa: Set datadir so that the path to the DriConf defaults is correct
2020-08-15 22:36:42 +02:00
Jan Tojnar
afe22f645a
Merge branch 'staging-next' into staging 2020-08-13 21:59:15 +02:00
Michael Weiss
cd41673813
mesa: Move the DriConf defaults from $drivers to $out
The effective change is that "drirc.d/00-mesa-defaults.conf" will now be
installed to $out instead of $drivers and not appear under
"/run/opengl-driver/share/" anymore.

This is done to fix #89421, i.e. so that Mesa will find and load the
included DriConf defaults. The other files in "$drivers/share" will not
be moved to $out as some Nixpkgs logic might depend on them being
available under "/run/opengl-driver/share/" (e.g. addOpenGLRunpath).
2020-08-13 21:35:55 +02:00
Niklas Hambüchen
85d08220d5 mesa: Fix -Werror=int-conversion build error on musl.
Upstream PR I made: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121
2020-08-12 03:40:44 +02:00
Michael Weiss
278f9b2a4c
mesa: 20.1.4 -> 20.1.5 2020-08-07 21:13:48 +02:00
Vladimír Čunát
9febe2f8fc
mesa: fold override of patchelf inside whole build
Overriding it just for .drivers had the advantage of limiting rebuilds,
but it seems less clean and apparently it can interact a bit surprisingly
with some other overrides.  /cc #94444.
Also this will get removed once patchelf gets updated.
2020-08-04 21:52:29 +02:00
David McFarland
535a3e8d48
mesa: add patch to link radv with build-id
Without this, the radv cache uuid would fall back to using the
timestamps of the radv and llvm shared libraries, which are fixed in
/nix/store.  This caused cache collisons, which resulted in crashes
(e.g. #92807).
2020-07-28 15:53:16 +02:00
Michael Weiss
fadfde220f
mesa: 2.1.3 -> 2.1.4 (#93708) 2020-07-23 22:24:17 +02:00
Cole Mickens
0e93ae3f67
mesa: 20.0.8 -> 20.1.3 (#92977) 2020-07-13 22:42:13 +02:00
Vladimír Čunát
c055851648
mesa: 20.0.7 -> 20.0.8
https://lists.freedesktop.org/archives/mesa-dev/2020-June/224501.html
/cc PR #89105; this is indeed announced to be the last 20.0 version.
2020-06-13 09:58:30 +02:00
Vladimír Čunát
04b1ed0440
Merge #89105: mesa: 20.0.2 -> 20.0.7 (into staging) 2020-06-07 09:56:38 +02:00
Matthew Bauer
c2039e1901
mesa: make more things optional (#87438)
osmesa & gallium-nine are not needed for all systems. So this adds a
flag to disable them if you don’t want them.
2020-05-29 22:29:32 -05:00
Michael Weiss
2bde87923e
mesa: 20.0.2 -> 20.0.7 2020-05-28 13:57:31 +02:00
Simonas Kazlauskas
62e6d73a09 mesa: Fix cross build 2020-05-27 17:59:56 +00:00
adisbladis
48a137da73
mesa: 20.0.1 -> 20.0.2 2020-03-28 14:26:09 +00:00
Michael Weiss
b5c1cb2e8a
mesa: 19.3.3 -> 20.0.1
New APIs implemented: OpenGL 4.6 and Vulkan 1.2
2020-03-11 15:50:01 +01:00
Cole Mickens
9974c65032 mesa: 19.3.2 -> 19.3.3 2020-01-30 01:23:14 -08:00
adisbladis
a6298636a6
mesa: 19.3.1 -> 19.3.2 2020-01-10 09:01:07 +00:00
adisbladis
a565d094c6
mesa: 19.2.7 -> 19.3.1 2020-01-03 16:58:40 +00:00
Will Dietz
09b97534c9
mesa: 19.2.6 -> 19.2.7 2019-12-04 21:58:55 -06:00
adisbladis
832f415252
mesa: 19.2.4 -> 19.2.6 2019-11-23 20:14:32 +00:00
Edmund Wu
e08831919c
mesa: 19.2.3 -> 19.2.4 2019-11-14 10:11:53 -05:00
adisbladis
1733a6f941
mesa: 19.2.1 -> 19.2.3 2019-11-09 10:34:50 +00:00
Jonathan Ringer
548b707584 mesa: fix build
latest versions (>=19.1.0), no longer need to delete
{,e}gl.pc after install
2019-10-22 17:36:19 -07:00
Vladimír Čunát
11dae1a516
Merge #69537: mesa: 19.1.5 -> 19.2.1 (into staging) 2019-10-09 20:44:55 +02:00
Vladimír Čunát
f22e7f5de0
mesa: 19.2.0 -> 19.2.1 2019-10-09 20:39:26 +02:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00