Commit Graph

379 Commits

Author SHA1 Message Date
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
adisbladis
a6929e9ff3
xorg.xorgserver: Fix build with mesa 19.2.3 2019-11-09 10:34:50 +00:00
Franz Pletz
baa5a73ba1
xorg.xf86videoomap: fix build with gcc9 2019-11-03 14:43:38 +01:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken
Refs:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
2019-10-08 17:14:26 +02:00
Samuel Dionne-Riel
85f97f2d01 libX11: adds upstream patch to fix cross-compilation
With this patch applied, cross-compilation of a system image for ARM
platforms works as it did previously.

See their commit for more explanation:

 * https://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=0327c427d62f671eced067c6d9b69f4e216a8cac
2019-09-27 21:06:21 -04:00
Daniel Șerbănescu
e2fca8b1db
nixos/xserver: refactor/fix xml tags for keyboard layout overrides
With the current XML tags there is an issue when building with a custom keyboard.
The description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst
2019-09-08 15:16:16 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
rnhmjoj
171d5c9200
nixos/xserver: add option to install custom xkb layouts 2019-07-26 18:08:04 +02:00
Daiderd Jordan
35b7c60c0c
xorg-xorgserver: remove cf-private 2019-07-03 22:20:19 +02:00
Will Dietz
d41bc0ff56 xkeyboardconfig: drop no-longer-applying esperanto patch 2019-07-03 08:52:51 +02:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Will Dietz
813799a6cb
xorg.xcalc: 1.0.7 -> 1.1.0
xcalc: ensure "app-defaults" resources are installed+found, works now
2019-06-12 00:00:10 -05:00
Robin Gloster
abb10fe7ae
xorg.libXi: fix cross 2019-05-07 18:14:11 +02:00
Pierre Bourdon
c689a3bad9 xkeyboard-config: intltool should be a nativeBuildInput (#59048) 2019-04-06 12:35:12 +00:00
Will Dietz
1aa5dc968f
Merge pull request #57778 from dtzWill/update/xorg-misc-2019-03
xorg: batch of updates, bump luit
2019-03-27 08:34:38 -05:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
Will Dietz
c489789f61 xorg.mkfontscale: 1.2.0 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2019-March/002988.html
2019-03-21 06:50:18 -05:00
Will Dietz
1be6087b1f xf86inputsynaptics: deps handled now
And drop `mtdev`, which appears to have been added unnecessarily.
2019-03-18 23:48:07 -05:00
Will Dietz
8d31888648 xorg: simplify overrides now handled automatically, GL -> libGL 2019-03-18 23:45:42 -05:00
Will Dietz
0e44d14dff xorg.mkfontdir: replace with mkfontscale, which now includes mkfontdir
See:
https://lists.x.org/archives/xorg-announce/2019-March/002960.html
2019-03-18 22:57:50 -05:00
xeji
e3357a1b5a
xorg.xload: fix build (#57665)
add missing dependency gettext
2019-03-15 16:45:10 +01:00
Vladimír Čunát
bf47162c26
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1508887
2019-03-10 08:04:21 +01:00
Josef Kemetmüller
680e9f1d91 xorg.editres: fix build (#56979) 2019-03-07 23:01:46 +01:00
Josef Kemetmüller
22160302cf xorg.oclock: Fix build (#56978) 2019-03-07 22:59:06 +01:00
Jorge Acereda
466f1d85d2 lndir: get rid of xorgproto dependency 2019-03-01 00:09:37 +01:00
Will Dietz
e063f54568 xorg.xf86inputlibinput: remove (?!) override of source
This is the wrong place for this and is outdated anyway,
so was forcing us to use this older version.
2019-02-23 12:05:08 -06:00
Daiderd Jordan
8c0cc98600
xorg.luit: fix darwin build 2019-01-22 23:11:14 +01:00
Vladimír Čunát
3cd97916fe
xorg xcursor-themes: fix build after #53127 2019-01-12 11:20:43 +01:00
Robin Gloster
23e49b78e5 xorg.xorgproto: add legacy support
This adds support for e.g. printproto needed for libXp

Adapted from @MP2E's patch in #48549
2019-01-04 14:38:57 +01:00
Lengyel Balazs
beaca82e48 xorg/mkfontscale: 1.1.2 -> 1.1.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs
51d6b1bdec xorg: adjust overrides to xorgproto 2019-01-04 14:38:57 +01:00
Jan Tojnar
aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging 2018-12-16 22:55:06 +01:00
Jörg Thalheim
048c48f405
libXinerama: fix cross-compilation 2018-12-13 11:39:17 +00:00
Jörg Thalheim
054b938c5c
libXt: fix cross-build 2018-12-12 08:02:19 +00:00
Jörg Thalheim
220dcada79
xorg.libXvMC: fix cross-build 2018-12-12 08:02:19 +00:00
Frederik Rietdijk
3e950d584c Merge staging-next into master 2018-12-08 16:29:21 +01:00
Will Dietz
5eff07f211 xf86videointel: 2017-10-19 -> 2018-12-03 2018-12-07 21:07:33 -06:00
Jörg Thalheim
84162175a3
Merge pull request #51180 from mayflower/xorg-cross
treewide: cross-fixes
2018-12-01 00:43:02 +00:00
Robin Gloster
b7893a700d
xorg.libXv: fix cross 2018-11-29 03:37:57 +01:00
Matthew Bauer
613e262fc2 imake: add setup hook 2018-11-28 20:14:33 -06:00
Robin Gloster
2d0fad757a
xorg: generate python into nativeBuildInputs 2018-11-28 14:28:32 +01:00
Robin Gloster
602efddc24
xorg.libX11: fix cross 2018-11-28 14:02:01 +01:00
Daiderd Jordan
ecf7c9c4b4
xorg.xorgserver: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _X11ApplicationMain in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table29 in libxpbproxy.a(x-selection.o)
    ld: symbol(s) not found for architecture x86_64
2018-11-06 19:00:03 +01:00
Bart Bakker
f565b95ca3
xorg.xf86videovmware: fix for GFX support
Fix the mesa dependency for `xorg.xf86videovmware`. Add `llvm_6` because
`mesa_noglu` has a runtime dependency on clang (see TODO in
`development/libraries/mesa`).
2018-10-27 09:57:29 +02:00
John Ericson
1147d2ed89 Merge remote-tracking branch 'upstream/master' into xorg-override 2018-10-18 12:00:37 -04:00
John Ericson
88cd633ea4 xorg: Don't use deprecated item 2018-10-18 11:54:20 -04:00
Andrew Childs
fb9604c4b7 xorg: simplify argument passing into xorg and overrides 2018-10-11 15:03:06 -04:00
Andrew Childs
9454f71fef xorg: allow overriding via overrideScope 2018-10-11 13:41:27 -04:00
Will Dietz
55a5236630 xf86-input-libinput: 0.26.0 -> 0.28.0
https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/log/
2018-09-21 07:58:57 -05:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Pascal Wittmann
0fa1ffd17f
xlsfonts: set license in overrides 2018-08-04 16:04:51 +02:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
John Ericson
db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
David McFarland
2b7fe3bf5a xorg: replace edits to generated script
- update versions in .list files to match
- move cf-files postInstall to overrides.nix
2018-05-19 17:21:40 -03:00
John Ericson
5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson
330ca731e8 treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
John Ericson
8e891e6ed4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 10:57:33 -04:00
Vladimír Čunát
3b6486f857
xorg.xorgserver: drop makeWrapper
It's been unused since 65da25997d.
2018-05-13 21:19:02 +02:00
Jörg Thalheim
991f8db51a xorgserver: add mesa_noglu for dri package 2018-05-13 14:42:13 +01:00
John Ericson
2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
Matthew Bauer
c839771129 xquartz: fix build
Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196
2018-05-11 23:55:59 -05:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Will Dietz
64c2e058e6 mesa, libglvnd, xorg: disable tls w/musl 2018-04-24 17:16:22 -05:00
Nikolay Amiantov
65da25997d xorg.xorgserver: don't use XORG_DRI_DRIVER_PATH
Our patch which adds this envvar has been removed.
2018-03-26 14:01:49 +03:00
Nikolay Amiantov
a798ec30f9 xorg: update autogeneration script
* Fix shebang so that it's usable on NixOS;
* Enable warnings (they were enabled with Perl flag before);
* Switch from mesa to libGL.
2018-03-26 14:01:49 +03:00
Shea Levy
d0a8866622
Merge branch 'binutils-2.30' into staging 2018-03-22 07:28:10 -04:00
Matthew Justin Bauer
ce01740dae
Merge pull request #33685 from corngood/amdgpu-pro-upgrade
amdgpu-pro: 17.10 -> 17.40
2018-03-19 12:40:03 -05:00
Shea Levy
0f172e971c
libxshmfence: Bump to 1.3.
Needed with glibc-2.27.
2018-03-17 21:58:14 -04:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Will Dietz
e7580d0f92 xorgserver: Builds! small workaround re:bad types 2018-02-13 09:44:55 -06:00
David McFarland
ebf1dade82 xorg: allow and check abiCompat on current version 2018-01-12 00:09:15 -04:00
adisbladis
c2316114bc
stdenv: Kill off ensureDir 2018-01-09 11:14:48 +08:00
Vladimír Čunát
e001bd2c2f
xorg-server-1.18: fixup build with glibc-2.26
It's non-default version required by amdgpu-pro ATM.  Thanks to Mounium.
2017-12-03 16:23:45 +01:00
Orivej Desh
6eddd8081f xorg.fontmiscmisc: make the misc fonts available
Xorg was rejecting font directories with symlinks since
db6adec156.
2017-12-01 10:37:03 +00:00
Tuomas Tynkkynen
86ad1451f2 xorg: Mark some xf86* drivers x86-only
https://hydra.nixos.org/eval/1413937?filter=xorg&compare=1358674
2017-11-30 19:03:14 +02:00
Vladimír Čunát
5f020d5627
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
2017-11-29 10:02:40 +01:00
Orivej Desh
4549190441 xorg.bitmap: provide resource search path 2017-11-29 04:29:43 +00:00
Vladimír Čunát
f6fe84d15d
xorg.bdftopcf: 1.0.5 -> 1.1 2017-11-27 13:09:19 +01:00
Tuomas Tynkkynen
9812babaef xorg.xf86inputlibinput: Split dev output
Closure goes from 160M -> 42M
2017-10-28 14:54:35 +03:00
Joerg Thalheim
c1addcdffa xf86-video-intel: 2017-04-18 -> 2017-10-19 2017-10-25 01:44:04 +01:00
Yegor Timoshenko
db11d7fd2b xf86-input-libinput: 0.25.1 -> 0.26.0 2017-10-15 12:13:58 -05:00
Vladimír Čunát
35f894860d
xf86-video-intel: fixup after #29039
This was one package in pkgs/servers/x11/xorg/default.nix
that was *not* generated, and that was missed in the PR
and overwritten (understandably).
Now the change is properly in overrides.nix to prevent that...
2017-10-08 10:55:34 +02:00
Vladimír Čunát
35b4c8be51
xorg-server: fixup build after #29039
The expression uncarefully overrode whole nativeBuildInputs,
so after the pkgconfig move it got removed and the build failed.
1.19.3 doesn't need these lines anyway...
2017-10-07 09:38:42 +02:00
John Ericson
f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Tuomas Tynkkynen
ebdbc08583 xorg: Split some man outputs from doc
Because soon manpages won't go to $doc anymore.
2017-08-11 21:32:53 +03:00
Carter Charbonneau
14bd516fa6 xf86-video-intel: build intel-virtual-output 2017-08-04 03:32:29 +02:00
Benjamin Staffin
7445649387
xorg-input-libinput: 0.25.0 -> 0.25.1
This isn't part of a full xorg release, so I just added it to the xorg
overrides.nix.

Changelog and release announcement:
https://lists.x.org/archives/xorg-announce/2017-May/002798.html
2017-06-04 13:47:05 -04:00
Vladimír Čunát
6bce07f876
xorg xf86-video-openchrome: 0.3.3 -> 0.6.0
Now it builds (again), but I haven't tested it in any other way.
2017-04-02 15:26:46 +02:00
Vladimír Čunát
da3c0ac19c
xorg.xorgserver: security 1.19.1 -> 1.19.2
Various bugfixes including CVE-2017-2624.
It seems to run without any problems for me.
2017-03-04 09:05:22 +01:00
Robin Gloster
56e624b155
xorg.xf86videoxgi: fix build with upstream patch 2017-02-27 12:43:58 +01:00
Vladimír Čunát
3348905cde
xorg-server: major bump 1.18.4 -> 1.19.1
I encountered no problems with it.  Nvidia binary drivers are tested,
and AMD ones now both set `abiCompat` to use older server versions.
2017-02-12 13:24:44 +01:00
Vladimír Čunát
ffefd83897
xorg xf86-video-*: bump drivers that seem unused
I verified they build, at least with xorg-server-1.19.1.
2017-02-12 12:57:42 +01:00
Vladimír Čunát
ce9d30e734
Merge #22241: amdgpu-pro: 16.50 -> 16.60 2017-02-07 20:49:58 +01:00
David McFarland
905627c7c5 xorg-server: fglrxCompat -> abiCompat
Allows it to be used for fglrx (1.17) and amdgpu-pro (1.18)
2017-02-06 23:16:21 -04:00