ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-13 16:07:30 +03:00
Code Issues Projects Releases Wiki Activity

Revert "wayland: mark as broken on darwin"

Browse Source 
This reverts commit d9986a53ee.

That commit turned a package that built for macOS into a package that
was marked broken for both (also breaking the wayland-scanner
attribute, which is important for cross-compiling to Linux), and
complicated the mesa-demos expression, with no explanation given and
only four hours of opportunity for review.
This commit is contained in:
Alyssa Ross 2023-02-05 22:17:47 +00:00
parent 1a29a7aef8
commit 1c561baac6
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/wayland/default.nix
View File

@ -8,7 +8,7 @@
, wayland-scanner
, expat
, libxml2
, withLibraries ? true
, withLibraries ? stdenv.isLinux
, libffi
, withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform
, graphviz-nox

12
pkgs/top-level/all-packages.nix
View File

@ -9084,17 +9084,7 @@ with pkgs;
memtester = callPackage ../tools/system/memtester { };
mesa-demos =
let
wayland' = wayland.override { withLibraries = stdenv.isLinux; };
in
callPackage ../tools/graphics/mesa-demos {
wayland = wayland';
wayland-protocols = wayland-protocols.override {
wayland = wayland';
wayland-scanner = wayland'.bin;
};
};
mesa-demos = callPackage ../tools/graphics/mesa-demos { };
mhonarc = perlPackages.MHonArc;