diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-10-03 21:13:20 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-10-03 21:13:27 +0200 |
| commit | e29e5077fc8b3cc0640eea708e50c3a98d551d8e (patch) | |
| tree | 70d874ce3c3af95c42711de56154f3378eb53a42 /pkgs/servers/x11 | |
| parent | 1cbe5c3e8ba7ad5701291acce3ac78dadf388231 (diff) | |
| parent | e61356b9863f71e7b965f9b8ac3820e7d71af1a0 (diff) | |
| download | nixlib-e29e5077fc8b3cc0640eea708e50c3a98d551d8e.tar nixlib-e29e5077fc8b3cc0640eea708e50c3a98d551d8e.tar.gz nixlib-e29e5077fc8b3cc0640eea708e50c3a98d551d8e.tar.bz2 nixlib-e29e5077fc8b3cc0640eea708e50c3a98d551d8e.tar.lz nixlib-e29e5077fc8b3cc0640eea708e50c3a98d551d8e.tar.xz nixlib-e29e5077fc8b3cc0640eea708e50c3a98d551d8e.tar.zst nixlib-e29e5077fc8b3cc0640eea708e50c3a98d551d8e.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/podcastparser/default.nix
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a66cf9ce1335..1a8c59deebff 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -134,7 +134,15 @@ self: super: }; }); - libxcvt = addMainProgram super.libxcvt { mainProgram = "cvt"; }; + libxcvt = super.libxcvt.overrideAttrs ({ meta ? {}, ... }: { + meta = meta // { + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcvt"; + mainProgram = "cvt"; + badPlatforms = meta.badPlatforms or [] ++ [ + lib.systems.inspect.platformPatterns.isStatic + ]; + }; + }); libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; |