Commit Graph

142 Commits

Author SHA1 Message Date
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Yohann Boniface
d20a86ccc1
pkgs/development/libraries: remove unused fetchpatch and other arguments (#313402) 2024-05-23 13:43:35 +02:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
Rick van Schijndel
ba75066821
Merge pull request #271362 from pbsds/rm-dead-patches
treewide: remove unreferenced patch files
2023-12-06 03:28:15 +01:00
Peder Bergebakken Sundt
f41aba3739 treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
2023-12-01 06:11:20 +01:00
Peder Bergebakken Sundt
ad5e744714 treewide: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck
This will respect `doCheck = false;` overrides, common for cross.
2023-11-30 18:56:12 +01:00
Alyssa Ross
729fb27ee8
cairo: fix cross
I accidentally left this commented out when I did the cairo update
that switched the build system to Meson.

Fixes: 2c0a4f46b9 ("cairo: 1.16.0 -> 1.18.0")
2023-10-25 19:50:44 +00:00
Alyssa Ross
2c0a4f46b9
cairo: 1.16.0 -> 1.18.0
- libiconv and expat are no longer used.
 - libintl and xcbutil no longer appear to be used.
 - The GL backend has been removed.
 - We can no longer disable PDF support, since something always
   propagates zlib.
 - Not sure whether the Requires.private is still needed, so I've left
   it.
2023-10-20 22:03:10 +00:00
figsoda
450f033b01 cairo: modernize patches 2023-06-08 21:54:56 -04:00
figsoda
19aec0cbcb cairo: update outdated patch link 2023-06-08 21:53:08 -04:00
Randy Eckenrode
50f1dbc5ed
cairo: fix build with newer clang
This is fixed upstream, but it’s not included in a release yet.
2023-05-29 16:01:18 -04:00
John Ericson
e7d06f4b0c cairo: Fix cairo-pdf in meta.pkgConfigModules 2023-02-11 11:02:59 -05:00
John Ericson
6db1d3229c cairo: Add meta.pkgConfigModules and test 2023-02-07 12:15:37 -05:00
Sandro Jäckel
cf50cc1363
cairo: remove unnecessary ? null from inputs, little cleanups 2022-11-27 22:25:51 +01:00
Sergei Trofimovich
b55345f131 cairo: pull upstream fix for grayscale aliasing bug
It's a cairo part of the fix for issue #185385 reported by @tobiasBora.
2022-08-06 10:05:07 +01:00
Jiajie Chen
5d3bef551c cairo: add patch to fix crashes on darwin
Apply patches regardless of os.
2022-07-06 16:44:34 +08:00
Alyssa Ross
686a131c98 cairo: enable debug info 2021-09-10 08:15:56 +00:00
Frederik Ramcke
e591a6235d
cairo: add patch for CVE-2020-35492 (PR: #131949) 2021-07-31 15:44:32 +02:00
Martin Weinelt
07dead5d63
Merge pull request #128297 from sternenseemann/cairo-unconditional-tee
cairo: enable tee unconditionally
2021-06-27 14:15:12 +02:00
sternenseemann
6102c4a326 cairo: enable tee unconditionally
The pycairo test suite fails on darwin because cairo's tee backend is
not enabled: https://github.com/pygobject/pycairo/issues/238
Since cairo builds on darwin fine with tee, there seems to be no
reason not to enable it.
2021-06-27 12:47:40 +02:00
Jan Tojnar
17dd568643
cairo: Apply patch to fix PDF output
Otherwise PDFs exported from Inkscape trip up ghostscript.
2021-06-16 19:56:11 +02:00
Ben Siraphob
2f78ee7e81 pkgs/development: stdenv.lib -> lib 2021-01-24 00:16:29 +07:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
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
Ryan Burns
6529627e13 cairo: fix build on darwin 2020-10-17 14:32:44 -07:00
Ben Wolsieffer
98be04b83a cairo: make OpenGL support require X11
If OpenGL is enabled without X11, the build fails with:

In file included from /nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/egl.h:39,
                 from cairo-gl.h:130,
                 from cairo-gl-private.h:51,
                 from cairo-gl-composite.c:48:
/nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/eglplatform.h:128:10: fatal error: X11/Xlib.h: No such file or directory
  128 | #include <X11/Xlib.h>
      |          ^~~~~~~~~~~~
compilation terminated.
2020-08-16 10:33:44 +00:00
worldofpeace
46bf4cb283
Merge pull request #83808 from glittershark/fix-cairo-no-xlib
cairo: pass --disable-xlib to config if no x11
2020-04-14 09:13:36 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Griffin Smith
84f720d9a4 cairo: pass --disable-xlib to config if no x11
It appears that cairo's configure script, at least on MacOS but perhaps
elsewhere, unconditionally enables xlib support, even if the library
isn't present, which breaks the build on MacOS always (since x11 is
disabled by default now). This explicitly passes `--disable-x11` if
x11Support is set to false, which fixes the build for me.
2020-03-30 16:42:55 -04:00
Ben Wolsieffer
34207efc93 cairo: enable GL support on 32-bit ARM and MIPS
Mesa works fine on ARM now and this can result in obscure ARM specific bugs.
2019-12-02 19:37:30 -05:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Matthew Bauer
f0733a07d5 treewide: remove libGLSupported from pkgs
This isn’t a package, and we already have mesaPlatforms to handle this logic.
2019-06-17 11:49:22 -04:00
Jorge Acereda
b7a41a280f cairo: make x11 optional, disabled on darwin 2019-04-18 09:41:29 +02:00
Symphorien Gibol
1f17cd9223 cairo: fix cross 2019-04-16 19:00:01 +02:00
Matthew Bauer
1d4efdc109 cairo: use buildInputs for libraries 2019-03-02 02:17:21 -05:00
Vladimír Čunát
32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
worldofpeace
21531d353b
Merge #55894: cairo: apply patch for CVE-2018-19876
(cherry picked from commit bad2db31b7)
Forward-picked from staging to staging-next;
it's a trivial patch and we now rebuild anyway due to unzip.
2019-02-17 08:25:53 +01:00
Jan Malakhovski
11e3bceff0 cairo: move defaults to package file 2019-02-03 15:32:17 +00:00
Will Dietz
1b04d28df2 cairo: 1.15.14 -> 1.16.0 2018-10-30 18:41:29 -05:00
Will Dietz
b4323269f5 cairo: 1.15.12 -> 1.15.14 2018-09-25 09:21:37 -05:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Orivej Desh
ef695239a0 cairo: 1.15.10 -> 1.15.12
The previous 1.15.10 (and the stable 1.14.12) have the bug
https://bugs.freedesktop.org/show_bug.cgi?id=104325 which breaks
perlPackages.Cairo and pythonPackages.cairocffi tests.
2018-05-30 21:22:35 +00:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jan Tojnar
b9219912de
cairo: 1.14.10 → 1.15.10 2018-04-12 11:53:47 +02:00
Matthew Bauer
ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00