Commit Graph

468 Commits

Author SHA1 Message Date
Quentin Smith
65601cbb21
xorg.xorgserver: Use substitute in patches instead of postPatch 2023-05-03 00:43:15 -04:00
Quentin Smith
d2cd23b9de
xorg.xorgserver: Restore XQuartz.app's usage of environment variables.
XQuartz.app needs to be able to find the `startx' from the `xinit'
package, but it defaults to assuming it is in the same directory as
the Xquartz binary, which it will never be. This restores a patch that
uses environment variables to locate `startx', which is what the
`xquartz' package is expecting to use.
2023-04-26 01:43:24 -04:00
Quentin Smith
f7416d72f6
xorg.xorgserver: Fix Xquartz stub on macOS
Xquartz has been broken since #40574 because the Xquartz binary
couldn't find the corresponding XQuartz.app. This commit restores an
earlier patch to use an environment variable to find XQuartz.app, and
additionally embeds the path to the XQuartz.app's Nix store location
as a default.
2023-04-25 03:18:26 -04:00
Maximilian Bosch
7046f09fe4
xorg.xdm: fix build w/glibc-2.36
Failing Hydra build: https://hydra.nixos.org/build/193323749
2023-03-29 09:50:28 +02:00
Weijia Wang
a99778adf6 xorg.xorgserver: fix build on darwin 2023-03-08 12:19:58 +02:00
superherointj
0268565fcc
Merge pull request #219864 from thiagokokada/xorg-pkgs-bump
xorg.xf86video{suncg6,sunffb,sunleo,trident,qxl}: bumps
2023-03-06 18:41:30 -03:00
Martin Weinelt
8127b7ce48
Merge pull request #219852 from vcunat/p/xorgserver-darwin
xorg.xorgserver: fixup build on *-darwin
2023-03-06 19:51:09 +00:00
Thiago Kenji Okada
194e9a120a
Merge pull request #180523 from talyz/intel-mesa-22
xf86videointel: Use the `crocus` and `iris` DRI drivers
2023-03-06 19:26:48 +00:00
Thiago Kenji Okada
cfc997d86d xorg.xf86videoqxl: 0.1.5 -> 0.1.6 2023-03-06 18:31:25 +00:00
Thiago Kenji Okada
7a550f8b8d xorg.xf86videotrident: 1.3.8 -> 1.4.0
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/4
2023-03-06 18:26:18 +00:00
Thiago Kenji Okada
be4adf5668 xorg.xf86videosunleo: 1.2.2 -> 1.2.3
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/merge_requests/2
2023-03-06 18:23:38 +00:00
Thiago Kenji Okada
46f6c447aa xorg.xf86videosunffb: 1.2.2 -> 1.2.3
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/merge_requests/2
2023-03-06 18:23:32 +00:00
Thiago Kenji Okada
9e88cf2c9e xorg.xf86videosuncg6: 1.1.2 -> 1.1.3
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/merge_requests/2
2023-03-06 18:23:26 +00:00
Vladimír Čunát
fcc9c904ca
xorg.xorgserver: fixup build on *-darwin
Broken by the update in be54beb.
2023-03-06 17:51:34 +01:00
Fabián Heredia Montiel
0c6d8cb679 xorg.xorgserver: 1.20.14 → 21.1.7
Diff:
https://github.com/freedesktop/xorg-xserver/compare/xorg-server-1.20.14...xorg-server-21.1.7

This reverts the revert on https://github.com/NixOS/nixpkgs/pull/174140
2023-03-01 08:47:09 -06:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
github-actions[bot]
371c2a6303
Merge staging-next into staging 2023-02-07 18:02:15 +00:00
Vladimír Čunát
48043f3f7d
Merge #215113: xorg.xorgserver: patch CVE-2023-0494
...into staging-next
2023-02-07 16:56:59 +01:00
Vladimír Čunát
7f41ad6c6c
xorg.xorgserver: patch CVE-2023-0494
https://lists.x.org/archives/xorg/2023-February/061255.html
2023-02-07 13:10:57 +01:00
github-actions[bot]
dae72e8486
Merge staging-next into staging 2023-02-05 12:02:01 +00:00
Vladimír Čunát
44cb005294
furnace, boringssl, gloox, xorg.xf86videovmware: gcc12 fixups 2023-02-05 11:57:01 +01:00
Weijia Wang
e9202e95e6
Merge pull request #207167 from alyssais/xorg-darwin
xorg.xorgserver: 1.18.4 -> 1.20.14 on Darwin (still broken)
2023-02-02 06:23:57 +01:00
Weijia Wang
327876fb7a xorg.xorgserver: remove 1.18 compat 2023-02-02 04:08:37 +01:00
Vladimír Čunát
9287f4461d
Merge #206907: stdenv: gcc11 -> gcc12 2023-02-01 16:54:44 +01:00
github-actions[bot]
fa361440fc
Merge staging-next into staging 2023-01-28 12:01:44 +00:00
Vladimír Čunát
1ea7e2bc44
xorg.libXpm: 3.5.13 -> 3.5.15
There are mainly the security fixes:
CVE-2022-46285 CVE-2022-44617 CVE-2022-4883

The new dependency adds just several kilobytes.
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01521.html
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01522.html
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01470.html
2023-01-28 10:51:56 +01:00
Fabián Heredia Montiel
0cf5d85f0c treewide: add gcc12 flags 2023-01-27 21:20:52 -06:00
Artturi
5e0e716865
Merge pull request #212115 from Artturin/splitthings1 2023-01-25 21:45:02 +02:00
Artturin
0ffa8f6b9e xorg.libXt: move share/doc to devdoc
1.2M
2023-01-22 19:00:44 +02:00
Alyssa Ross
13d8068354
xorg.libpciaccess: fix build on NetBSD 2023-01-13 04:49:21 +00:00
Alyssa Ross
abdc781d4c
xorg.libpciaccess: broaden platforms 2023-01-13 04:49:20 +00:00
Artturi
5ce27e15ea
Merge pull request #208900 from Artturin/xorgwrapWithXFileSearchPathHook 2023-01-04 16:52:48 +02:00
Artturin
68ed486d30 xorg: remove unnecessary overrides 2023-01-03 19:31:00 +02:00
Artturin
659574008e xorg.{libFS,libWindowsWM}: fix cross 2023-01-03 19:14:17 +02:00
Artturin
277a523dda xorg: add wrapWithXFileSearchPathHook
supersedes PR 70239

Description from that PR

Make xorg apps look as intended. Most notable change: xmag color picker is usable now.

Before this commit, only two apps had properly configured resource paths: bitmap and xcalc. This commit automates and generalizes it to the rest of xorg.* apps.

xorg.bitmap: bin/bitmap-color is no longer installed. If you would like bitmap to be viewable in color, please refer to man 1 bitmap, selection COLORS. The described method is also applied to some other affected apps.
2023-01-03 18:51:48 +02:00
Jan Tojnar
5810109b42 Merge branch 'staging-next' into staging
- readline6 attribute removed from all-packages.nix in d879125d61
- readline attribute was bumped to readline82 in 50adabdd60
2023-01-02 03:04:32 +01:00
Naïm Favier
4df10debe7
lib/customisation.overrideDerivation: propagate evaluation condition
The new derivation should evaluate only if the old derivation does.

Sadly this means that the old derivation cannot depend on the new one
any more, which was used by xorgserver on Darwin. But this is not a
problem as `overrideAttrs` can (and should) usually be used instead.

This change allowed catching an invalid `meta.platforms` in the linux_rpi
kernels, which use `overrideDerivation`.
2023-01-01 14:10:42 +01:00
Weijia Wang
90af686ddb xorgcffiles: add aarch64-darwin support 2022-12-30 06:40:45 +01:00
Alyssa Ross
0a55054b16
xorg.xorgserver: 1.18.4 -> 1.20.14 on Darwin (still broken)
Previously, Darwin was kept on 1.18 because more recent versions were
broken, but now 1.18 is also broken on Darwin, so we might as well get
rid of the special case and bring Darwin forward.  With these changes,
xQuartz builds on Darwin, but when run it will exit immediately.

This makes Darwin use the same derivation as Linux by default, which
will enable further cleanups.  But as a result, we have to fix some
Linuxisms.

 * Only add libdrm dependency on compatible platforms.
 * Add libepoxy dependency for all platforms.
 * Add bootstrap_cmds dependency on Darwin.
 * Disable glamor on Darwin.
2022-12-21 22:39:58 +00:00
Artturin
a6edc3de15 xorg.xorgserver: apply CVE patches
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01511.html
2022-12-16 17:26:50 +02:00
github-actions[bot]
6aeef7531c
Merge staging-next into staging 2022-11-28 06:01:53 +00:00
Daniel Nagy
308abeb67b
xorg.xinit: also use systemwide xinitrc (#186997)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-11-28 01:06:57 +01:00
Artturin
efb9b804a7 xorg.xdm: fix cross
```
xdm-aarch64-unknown-linux-gnu> checking for cpp... no
xdm-aarch64-unknown-linux-gnu> checking if aarch64-unknown-linux-gnu-gcc -E requires -undef... aarch64-unknown-linux-gnu-gcc: fatal error: noinput files
xdm-aarch64-unknown-linux-gnu> compilation terminated.
xdm-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
xdm-aarch64-unknown-linux-gnu> compilation terminated.
xdm-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
xdm-aarch64-unknown-linux-gnu> compilation terminated.
xdm-aarch64-unknown-linux-gnu> configure: error: aarch64-unknown-linux-gnu-gcc -E defines unix with or without -undef.  I don't know what to do.
```

it appears that the configure script isn't checking
`${ac_tool_prefix}cpp`

```
for ac_prog in cpp
do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_RAWCPP+:} false; then :
```
2022-11-11 16:57:35 +02:00
Artturin
ddb88250e4 xorg.imake: fix cross
```
imake-aarch64-unknown-linux-gnu> checking for cpp... no
imake-aarch64-unknown-linux-gnu> checking if aarch64-unknown-linux-gnu-gcc -E requires -undef... aarch64-unknown-linux-gnu-gcc: fatal error: noinput files
imake-aarch64-unknown-linux-gnu> compilation terminated.
imake-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
imake-aarch64-unknown-linux-gnu> compilation terminated.
imake-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
imake-aarch64-unknown-linux-gnu> compilation terminated.
imake-aarch64-unknown-linux-gnu> configure: error: aarch64-unknown-linux-gnu-gcc -E defines unix with or without -undef.  I don't know what to do.
```

it appears that the configure script isn't checking
`${ac_tool_prefix}cpp`

```
for ac_prog in cpp
do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_RAWCPP+:} false; then :
```
2022-11-11 16:57:35 +02:00
Artturin
7e00495eae xorg: use top-level xorg instead of self in overrides.nix
the packages will be spliced correctly
2022-11-11 04:45:27 +02:00
Artturin
d6a9e82668 xorg: detect if XORG_FONT_REQUIRED_PROG(MKFONTSCALE in generate-expr-from-tarballs 2022-11-11 04:43:46 +02:00
Artturin
1a77429299 xorg.xdm: add libxcrypt to buildInputs 2022-11-11 04:43:46 +02:00