mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 00:53:57 +00:00
9bb3fccb5b
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.
912 lines
32 KiB
Nix
912 lines
32 KiB
Nix
{ abiCompat ? null,
|
|
stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
|
|
automake, autoconf, gettext, libiconv, libtool, intltool,
|
|
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
|
|
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
|
|
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
|
|
mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt,
|
|
ApplicationServices, Carbon, Cocoa, Xplugin
|
|
}:
|
|
|
|
let
|
|
inherit (stdenv) lib isDarwin;
|
|
inherit (lib) overrideDerivation;
|
|
|
|
malloc0ReturnsNullCrossFlag = lib.optional
|
|
(stdenv.hostPlatform != stdenv.buildPlatform)
|
|
"--enable-malloc0returnsnull";
|
|
in
|
|
self: super:
|
|
{
|
|
bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [ self.xorgproto ];
|
|
});
|
|
|
|
bitmap = super.bitmap.overrideAttrs (attrs: {
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
|
|
postInstall = ''
|
|
paths=(
|
|
"$out/share/X11/%T/%N"
|
|
"$out/include/X11/%T/%N"
|
|
"${self.xbitmaps}/include/X11/%T/%N"
|
|
)
|
|
wrapProgram "$out/bin/bitmap" \
|
|
--suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
|
|
makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \
|
|
--suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color"
|
|
'';
|
|
});
|
|
|
|
encodings = super.encodings.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
|
|
});
|
|
|
|
editres = super.editres.overrideAttrs (attrs: {
|
|
hardeningDisable = [ "format" ];
|
|
});
|
|
|
|
fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
|
|
postInstall =
|
|
''
|
|
ALIASFILE=${self.fontalias}/share/fonts/X11/misc/fonts.alias
|
|
test -f $ALIASFILE
|
|
cp $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias
|
|
'';
|
|
});
|
|
|
|
imake = super.imake.overrideAttrs (attrs: {
|
|
inherit (self) xorgcffiles;
|
|
x11BuildHook = ./imake.sh;
|
|
patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
|
|
setupHook = ./imake-setup-hook.sh;
|
|
CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${if stdenv.isDarwin
|
|
then "${tradcpp}/bin/cpp"
|
|
else "gcc"}\"'";
|
|
|
|
inherit tradcpp;
|
|
});
|
|
|
|
mkfontdir = self.mkfontscale;
|
|
|
|
libxcb = super.libxcb.overrideAttrs (attrs: {
|
|
configureFlags = [ "--enable-xkb" "--enable-xinput" ]
|
|
++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
|
|
outputs = [ "out" "dev" "man" "doc" ];
|
|
});
|
|
|
|
libX11 = super.libX11.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "man" ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
depsBuildBuild = [
|
|
buildPackages.stdenv.cc
|
|
] ++ lib.optionals stdenv.hostPlatform.isStatic [
|
|
(self.buildPackages.stdenv.cc.libc.static or null)
|
|
];
|
|
preConfigure = ''
|
|
sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
|
|
'';
|
|
postInstall = ''
|
|
# Remove useless DocBook XML files.
|
|
rm -rf $out/share/doc
|
|
'';
|
|
CPP = lib.optionalString stdenv.isDarwin "clang -E -";
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];
|
|
});
|
|
|
|
libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [ ApplicationServices ];
|
|
preConfigure = ''
|
|
substituteInPlace src/Makefile.in --replace -F/System -F${ApplicationServices}
|
|
'';
|
|
});
|
|
|
|
libXau = super.libXau.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];
|
|
});
|
|
|
|
libXdmcp = super.libXdmcp.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "doc" ];
|
|
});
|
|
|
|
libXfont = super.libXfont.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ freetype ]; # propagate link reqs. like bzip2
|
|
# prevents "misaligned_stack_error_entering_dyld_stub_binder"
|
|
configureFlags = lib.optional isDarwin "CFLAGS=-O0";
|
|
});
|
|
|
|
libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
libXxf86dga = super.libXxf86dga.overrideAttrs (attrs: {
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: {
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
libdmx = super.libdmx.overrideAttrs (attrs: {
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
preConfigure = attrs.preConfigure or ""
|
|
# missing transitive dependencies
|
|
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
|
export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp"
|
|
'';
|
|
});
|
|
|
|
# Propagate some build inputs because of header file dependencies.
|
|
# Note: most of these are in Requires.private, so maybe builder.sh
|
|
# should propagate them automatically.
|
|
libXt = super.libXt.overrideAttrs (attrs: {
|
|
preConfigure = ''
|
|
sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
|
|
'';
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libSM ];
|
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
|
CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -";
|
|
outputs = [ "out" "dev" "devdoc" ];
|
|
});
|
|
|
|
luit = super.luit.overrideAttrs (attrs: {
|
|
# See https://bugs.freedesktop.org/show_bug.cgi?id=47792
|
|
# Once the bug is fixed upstream, this can be removed.
|
|
configureFlags = [ "--disable-selective-werror" ];
|
|
|
|
buildInputs = attrs.buildInputs ++ [libiconv];
|
|
});
|
|
|
|
libICE = super.libICE.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "doc" ];
|
|
});
|
|
|
|
libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ];
|
|
});
|
|
|
|
libXaw = super.libXaw.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "devdoc" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXmu ];
|
|
});
|
|
|
|
libXcursor = super.libXcursor.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
});
|
|
|
|
libXdamage = super.libXdamage.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
});
|
|
|
|
libXft = super.libXft.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender freetype fontconfig ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
|
|
patches = [
|
|
# Adds color emoji rendering support.
|
|
# https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1
|
|
(fetchpatch {
|
|
url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/fe41537b5714a2301808eed2d76b2e7631176573.patch";
|
|
sha256 = "045lp1q50i2wlwvpsq6ycxdc6p3asm2r3bk2nbad1dwkqw2xf9jc";
|
|
})
|
|
];
|
|
|
|
# the include files need ft2build.h, and Requires.private isn't enough for us
|
|
postInstall = ''
|
|
sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
|
|
'';
|
|
passthru = {
|
|
inherit freetype fontconfig;
|
|
};
|
|
});
|
|
|
|
libXext = super.libXext.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "man" "doc" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto self.libXau ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
|
|
libXfixes = super.libXfixes.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
});
|
|
|
|
libXi = super.libXi.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "man" "doc" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ];
|
|
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
|
"xorg_cv_malloc0_returns_null=no"
|
|
] ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
|
|
});
|
|
|
|
libXinerama = super.libXinerama.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
|
|
libXmu = super.libXmu.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "doc" ];
|
|
buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ];
|
|
});
|
|
|
|
libXrandr = super.libXrandr.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender ];
|
|
});
|
|
|
|
libSM = super.libSM.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "doc" ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libICE ];
|
|
});
|
|
|
|
libXrender = super.libXrender.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "doc" ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];
|
|
});
|
|
|
|
libXres = super.libXres.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "devdoc" ];
|
|
buildInputs = with self; attrs.buildInputs ++ [ utilmacros ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
|
|
libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: {
|
|
buildInputs = with self; attrs.buildInputs ++ [ utilmacros ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
|
|
libXv = super.libXv.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "devdoc" ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
});
|
|
|
|
libXvMC = super.libXvMC.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" "doc" ];
|
|
configureFlags = attrs.configureFlags or []
|
|
++ malloc0ReturnsNullCrossFlag;
|
|
buildInputs = attrs.buildInputs ++ [self.xorgproto];
|
|
});
|
|
|
|
libXp = super.libXp.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
});
|
|
|
|
libXpm = super.libXpm.overrideAttrs (attrs: {
|
|
outputs = [ "bin" "dev" "out" ]; # tiny man in $bin
|
|
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
|
|
});
|
|
|
|
libXpresent = super.libXpresent.overrideAttrs (attrs: {
|
|
buildInputs = with self; attrs.buildInputs ++ [ libXext libXfixes libXrandr ];
|
|
});
|
|
|
|
libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ]; # mainly to avoid propagation
|
|
});
|
|
|
|
libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
|
|
name = "libxshmfence-1.3";
|
|
src = fetchurl {
|
|
url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2";
|
|
sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q";
|
|
};
|
|
outputs = [ "out" "dev" ]; # mainly to avoid propagation
|
|
});
|
|
|
|
libpciaccess = super.libpciaccess.overrideAttrs (attrs: {
|
|
meta = attrs.meta // { platforms = lib.platforms.linux; };
|
|
});
|
|
|
|
setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
|
|
postInstall =
|
|
''
|
|
mkdir -p $out/share/man/man7
|
|
ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11
|
|
ln -sfn ${self.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7
|
|
'';
|
|
});
|
|
|
|
utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ automake autoconf libtool ];
|
|
});
|
|
|
|
x11perf = super.x11perf.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [ freetype fontconfig ];
|
|
});
|
|
|
|
xcbutil = super.xcbutil.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
});
|
|
|
|
xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
meta = attrs.meta // { maintainers = [ lib.maintainers.lovek323 ]; };
|
|
});
|
|
|
|
xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
|
|
});
|
|
|
|
xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
|
|
});
|
|
|
|
xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
|
|
});
|
|
|
|
xcbutilwm = super.xcbutilwm.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
|
|
});
|
|
|
|
xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
|
|
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
|
|
installFlags = [
|
|
"sdkdir=${placeholder ''out''}/include/xorg"
|
|
];
|
|
});
|
|
|
|
xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
|
|
installFlags = [
|
|
"sdkdir=${placeholder ''out''}/include/xorg"
|
|
];
|
|
});
|
|
|
|
xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
|
|
installFlags = [
|
|
"sdkdir=${placeholder ''out''}/include/xorg"
|
|
];
|
|
});
|
|
|
|
xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ];
|
|
installFlags = [
|
|
"sdkdir=${placeholder ''dev''}/include/xorg"
|
|
];
|
|
});
|
|
|
|
xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
|
|
outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
|
|
installFlags = [
|
|
"sdkdir=${placeholder ''out''}/include/xorg"
|
|
"configdir=${placeholder ''out''}/share/X11/xorg.conf.d"
|
|
];
|
|
});
|
|
|
|
xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: {
|
|
configureFlags = [
|
|
"--sysconfdir=${placeholder ''out''}/etc"
|
|
"--with-xorg-conf-dir=${placeholder ''out''}/share/X11/xorg.conf.d"
|
|
"--with-udev-rules-dir=${placeholder ''out''}/lib/udev/rules.d"
|
|
];
|
|
|
|
meta = attrs.meta // {
|
|
platforms = ["i686-linux" "x86_64-linux"];
|
|
};
|
|
});
|
|
|
|
# Obsolete drivers that don't compile anymore.
|
|
xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videoglide = super.xf86videoglide.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videonewport = super.xf86videonewport.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videos3virge = super.xf86videos3virge.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videosavage = super.xf86videosavage.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videotga = super.xf86videotga.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
|
|
|
xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: {
|
|
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ];
|
|
});
|
|
|
|
xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: {
|
|
configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
|
|
});
|
|
|
|
xf86videoati = super.xf86videoati.overrideAttrs (attrs: {
|
|
NIX_CFLAGS_COMPILE = "-I${self.xorgserver.dev or self.xorgserver}/include/xorg";
|
|
});
|
|
|
|
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [ mesa llvm_6 ]; # for libxatracker
|
|
meta = attrs.meta // {
|
|
platforms = ["i686-linux" "x86_64-linux"];
|
|
};
|
|
});
|
|
|
|
xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [ spice-protocol ];
|
|
});
|
|
|
|
xf86videosiliconmotion = super.xf86videosiliconmotion.overrideAttrs (attrs: {
|
|
meta = attrs.meta // {
|
|
platforms = ["i686-linux" "x86_64-linux"];
|
|
};
|
|
});
|
|
|
|
xdriinfo = super.xdriinfo.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [libGL];
|
|
});
|
|
|
|
xvinfo = super.xvinfo.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [self.libXext];
|
|
});
|
|
|
|
xkbcomp = super.xkbcomp.overrideAttrs (attrs: {
|
|
configureFlags = [ "--with-xkb-config-root=${self.xkeyboardconfig}/share/X11/xkb" ];
|
|
});
|
|
|
|
xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
|
|
prePatch = "patchShebangs rules/merge.py";
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [ intltool libxslt ];
|
|
configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
|
|
|
|
# 1: compatibility for X11/xkb location
|
|
# 2: I think pkg-config/ is supposed to be in /lib/
|
|
postInstall = ''
|
|
ln -s share "$out/etc"
|
|
mkdir -p "$out/lib" && ln -s ../share/pkgconfig "$out/lib/"
|
|
'';
|
|
});
|
|
|
|
# xkeyboardconfig variant extensible with custom layouts.
|
|
# See nixos/modules/services/x11/extra-layouts.nix
|
|
xkeyboardconfig_custom = { layouts ? { } }:
|
|
let
|
|
patchIn = name: layout:
|
|
with layout;
|
|
with lib;
|
|
''
|
|
# install layout files
|
|
${optionalString (compatFile != null) "cp '${compatFile}' 'compat/${name}'"}
|
|
${optionalString (geometryFile != null) "cp '${geometryFile}' 'geometry/${name}'"}
|
|
${optionalString (keycodesFile != null) "cp '${keycodesFile}' 'keycodes/${name}'"}
|
|
${optionalString (symbolsFile != null) "cp '${symbolsFile}' 'symbols/${name}'"}
|
|
${optionalString (typesFile != null) "cp '${typesFile}' 'types/${name}'"}
|
|
|
|
# patch makefiles
|
|
for type in compat geometry keycodes symbols types; do
|
|
if ! test -f "$type/${name}"; then
|
|
continue
|
|
fi
|
|
test "$type" = geometry && type_name=geom || type_name=$type
|
|
${ed}/bin/ed -v $type/Makefile.am <<EOF
|
|
/''${type_name}_DATA =
|
|
a
|
|
${name} \\
|
|
.
|
|
w
|
|
EOF
|
|
${ed}/bin/ed -v $type/Makefile.in <<EOF
|
|
/''${type_name}_DATA =
|
|
a
|
|
${name} \\
|
|
.
|
|
w
|
|
EOF
|
|
done
|
|
|
|
# add model description
|
|
${ed}/bin/ed -v rules/base.xml <<EOF
|
|
/<\/modelList>
|
|
-
|
|
a
|
|
<model>
|
|
<configItem>
|
|
<name>${name}</name>
|
|
<description>${layout.description}</description>
|
|
<vendor>${layout.description}</vendor>
|
|
</configItem>
|
|
</model>
|
|
.
|
|
w
|
|
EOF
|
|
|
|
# add layout description
|
|
${ed}/bin/ed -v rules/base.xml <<EOF
|
|
/<\/layoutList>
|
|
-
|
|
a
|
|
<layout>
|
|
<configItem>
|
|
<name>${name}</name>
|
|
<shortDescription>${name}</shortDescription>
|
|
<description>${layout.description}</description>
|
|
<languageList>
|
|
${concatMapStrings (lang: "<iso639Id>${lang}</iso639Id>\n") layout.languages}
|
|
</languageList>
|
|
</configItem>
|
|
<variantList/>
|
|
</layout>
|
|
.
|
|
w
|
|
EOF
|
|
'';
|
|
in
|
|
self.xkeyboardconfig.overrideAttrs (old: {
|
|
buildInputs = old.buildInputs ++ [ automake ];
|
|
postPatch = with lib; concatStrings (mapAttrsToList patchIn layouts);
|
|
});
|
|
|
|
xload = super.xload.overrideAttrs (attrs: {
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [ gettext ];
|
|
});
|
|
|
|
xlsfonts = super.xlsfonts.overrideAttrs (attrs: {
|
|
meta = attrs.meta // { license = lib.licenses.mit; };
|
|
});
|
|
|
|
xorgproto = super.xorgproto.overrideAttrs (attrs: {
|
|
buildInputs = [];
|
|
propagatedBuildInputs = [];
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ];
|
|
# adds support for printproto needed for libXp
|
|
mesonFlags = [ "-Dlegacy=true" ];
|
|
});
|
|
|
|
xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed:
|
|
# exchange attrs if abiCompat is set
|
|
let
|
|
version = lib.getVersion attrs_passed;
|
|
attrs =
|
|
if (abiCompat == null || lib.hasPrefix abiCompat version) then
|
|
attrs_passed // {
|
|
buildInputs = attrs_passed.buildInputs ++ [ libdrm.dev ]; postPatch = ''
|
|
for i in dri3/*.c
|
|
do
|
|
sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i
|
|
done
|
|
'';}
|
|
else if (abiCompat == "1.17") then {
|
|
name = "xorg-server-1.17.4";
|
|
builder = ./builder.sh;
|
|
src = fetchurl {
|
|
url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2";
|
|
sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
|
|
};
|
|
nativeBuildInputs = [ pkg-config ];
|
|
buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
|
|
meta.platforms = lib.platforms.unix;
|
|
} else if (abiCompat == "1.18") then {
|
|
name = "xorg-server-1.18.4";
|
|
builder = ./builder.sh;
|
|
src = fetchurl {
|
|
url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2";
|
|
sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
|
|
};
|
|
nativeBuildInputs = [ pkg-config ];
|
|
buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
|
|
postPatch = lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h";
|
|
meta.platforms = lib.platforms.unix;
|
|
} else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}";
|
|
|
|
in attrs //
|
|
(let
|
|
version = lib.getVersion attrs;
|
|
commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
|
|
commonPropagatedBuildInputs = [
|
|
zlib libGL libGLU dbus
|
|
xorgproto
|
|
libXext pixman libXfont libxshmfence libunwind
|
|
libXfont2
|
|
];
|
|
# XQuartz requires two compilations: the first to get X / XQuartz,
|
|
# and the second to get Xvfb, Xnest, etc.
|
|
darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
|
|
configureFlags = oldAttrs.configureFlags ++ [
|
|
"--disable-xquartz"
|
|
"--enable-xorg"
|
|
"--enable-xvfb"
|
|
"--enable-xnest"
|
|
"--enable-kdrive"
|
|
];
|
|
postInstall = ":"; # prevent infinite recursion
|
|
});
|
|
in
|
|
if (!isDarwin)
|
|
then {
|
|
outputs = [ "out" "dev" ];
|
|
patches = [
|
|
# The build process tries to create the specified logdir when building.
|
|
#
|
|
# We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail
|
|
./dont-create-logdir-during-build.patch
|
|
];
|
|
buildInputs = commonBuildInputs ++ [ libdrm mesa ];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
|
|
udev
|
|
];
|
|
prePatch = lib.optionalString stdenv.hostPlatform.isMusl ''
|
|
export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
|
|
'';
|
|
configureFlags = [
|
|
"--enable-kdrive" # not built by default
|
|
"--enable-xephyr"
|
|
"--enable-xcsecurity" # enable SECURITY extension
|
|
"--with-default-font-path=" # there were only paths containing "${prefix}",
|
|
# and there are no fonts in this package anyway
|
|
"--with-xkb-bin-directory=${self.xkbcomp}/bin"
|
|
"--with-xkb-path=${self.xkeyboardconfig}/share/X11/xkb"
|
|
"--with-xkb-output=$out/share/X11/xkb/compiled"
|
|
"--with-log-dir=/var/log"
|
|
"--enable-glamor"
|
|
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
|
"--disable-tls"
|
|
];
|
|
|
|
postInstall = ''
|
|
rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
|
|
( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
|
|
cd "$dev"
|
|
for f in include/xorg/*.h; do
|
|
sed "1i#line 1 \"${attrs.name}/$f\"" -i "$f"
|
|
done
|
|
)
|
|
'';
|
|
passthru.version = version; # needed by virtualbox guest additions
|
|
} else {
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook self.utilmacros self.fontutil ];
|
|
buildInputs = commonBuildInputs ++ [
|
|
bootstrap_cmds automake autoconf
|
|
Xplugin Carbon Cocoa
|
|
];
|
|
propagatedBuildInputs = commonPropagatedBuildInputs ++ [
|
|
libAppleWM xorgproto
|
|
];
|
|
|
|
patches = [
|
|
# XQuartz patchset
|
|
(fetchpatch {
|
|
url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
|
|
sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";
|
|
name = "use-cppflags-not-cflags.patch";
|
|
})
|
|
(fetchpatch {
|
|
url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch";
|
|
sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg";
|
|
name = "use-old-mitrapezoids-and-mitriangles-routines.patch";
|
|
})
|
|
(fetchpatch {
|
|
url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch";
|
|
sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i";
|
|
name = "revert-fb-changes-1.patch";
|
|
})
|
|
(fetchpatch {
|
|
url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch";
|
|
sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396";
|
|
name = "revert-fb-changes-2.patch";
|
|
})
|
|
];
|
|
|
|
configureFlags = [
|
|
# note: --enable-xquartz is auto
|
|
"CPPFLAGS=-I${./darwin/dri}"
|
|
"--with-default-font-path="
|
|
"--with-apple-application-name=XQuartz"
|
|
"--with-apple-applications-dir=\${out}/Applications"
|
|
"--with-bundle-id-prefix=org.nixos.xquartz"
|
|
"--with-sha1=CommonCrypto"
|
|
];
|
|
preConfigure = ''
|
|
mkdir -p $out/Applications
|
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
|
|
substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${ApplicationServices}
|
|
'';
|
|
postInstall = ''
|
|
rm -fr $out/share/X11/xkb/compiled
|
|
|
|
cp -rT ${darwinOtherX}/bin $out/bin
|
|
rm -f $out/bin/X
|
|
ln -s Xquartz $out/bin/X
|
|
|
|
cp ${darwinOtherX}/share/man -rT $out/share/man
|
|
'' ;
|
|
passthru.version = version;
|
|
}));
|
|
|
|
lndir = super.lndir.overrideAttrs (attrs: {
|
|
buildInputs = [];
|
|
preConfigure = ''
|
|
export XPROTO_CFLAGS=" "
|
|
export XPROTO_LIBS=" "
|
|
substituteInPlace lndir.c \
|
|
--replace '<X11/Xos.h>' '<string.h>' \
|
|
--replace '<X11/Xfuncproto.h>' '<unistd.h>' \
|
|
--replace '_X_ATTRIBUTE_PRINTF(1,2)' '__attribute__((__format__(__printf__,1,2)))' \
|
|
--replace '_X_ATTRIBUTE_PRINTF(2,3)' '__attribute__((__format__(__printf__,2,3)))' \
|
|
--replace '_X_NORETURN' '__attribute__((noreturn))' \
|
|
--replace 'n_dirs--;' ""
|
|
'';
|
|
});
|
|
|
|
twm = super.twm.overrideAttrs (attrs: {
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [bison flex];
|
|
});
|
|
|
|
xauth = super.xauth.overrideAttrs (attrs: {
|
|
doCheck = false; # fails
|
|
preConfigure = attrs.preConfigure or ""
|
|
# missing transitive dependencies
|
|
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
|
export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp"
|
|
'';
|
|
});
|
|
|
|
xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ [ self.xcursorgen self.xorgproto ];
|
|
configureFlags = [ "--with-cursordir=$(out)/share/icons" ];
|
|
});
|
|
|
|
xinit = (super.xinit.override {
|
|
stdenv = if isDarwin then clangStdenv else stdenv;
|
|
}).overrideAttrs (attrs: {
|
|
buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds;
|
|
configureFlags = [
|
|
"--with-xserver=${self.xorgserver.out}/bin/X"
|
|
] ++ lib.optionals isDarwin [
|
|
"--with-bundle-id-prefix=org.nixos.xquartz"
|
|
"--with-launchdaemons-dir=\${out}/LaunchDaemons"
|
|
"--with-launchagents-dir=\${out}/LaunchAgents"
|
|
];
|
|
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ]
|
|
++ lib.optionals isDarwin [ self.libX11 self.xorgproto ];
|
|
postFixup = ''
|
|
substituteInPlace $out/bin/startx --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc
|
|
'';
|
|
});
|
|
|
|
xf86videointel = super.xf86videointel.overrideAttrs (attrs: {
|
|
# the update script only works with released tarballs :-/
|
|
name = "xf86-video-intel-2019-12-09";
|
|
src = fetchFromGitLab {
|
|
domain = "gitlab.freedesktop.org";
|
|
group = "xorg";
|
|
owner = "driver";
|
|
repo = "xf86-video-intel";
|
|
rev = "f66d39544bb8339130c96d282a80f87ca1606caf";
|
|
sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl";
|
|
};
|
|
buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ];
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];
|
|
configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
|
|
|
|
meta = attrs.meta // {
|
|
platforms = ["i686-linux" "x86_64-linux"];
|
|
};
|
|
});
|
|
|
|
xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: {
|
|
patches = [
|
|
# fixes invalid open mode
|
|
# https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/commit/?id=bd94c475035739b42294477cff108e0c5f15ef67
|
|
(fetchpatch {
|
|
url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=bd94c475035739b42294477cff108e0c5f15ef67";
|
|
sha256 = "0myfry07655adhrpypa9rqigd6rfx57pqagcwibxw7ab3wjay9f6";
|
|
})
|
|
(fetchpatch {
|
|
url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=78d1138dd6e214a200ca66fa9e439ee3c9270ec8";
|
|
sha256 = "0z3643afgrync280zrp531ija0hqxc5mrwjif9nh9lcnzgnz2d6d";
|
|
})
|
|
];
|
|
});
|
|
|
|
xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: {
|
|
postInstall = lib.optionalString stdenv.isDarwin ''
|
|
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
|
|
'';
|
|
});
|
|
|
|
xwd = super.xwd.overrideAttrs (attrs: {
|
|
buildInputs = with self; attrs.buildInputs ++ [libXt];
|
|
});
|
|
|
|
xrdb = super.xrdb.overrideAttrs (attrs: {
|
|
configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ];
|
|
});
|
|
|
|
sessreg = super.sessreg.overrideAttrs (attrs: {
|
|
preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile";
|
|
});
|
|
|
|
xrandr = super.xrandr.overrideAttrs (attrs: {
|
|
postInstall = ''
|
|
rm $out/bin/xkeystone
|
|
'';
|
|
});
|
|
|
|
xcalc = super.xcalc.overrideAttrs (attrs: {
|
|
configureFlags = attrs.configureFlags or [] ++ [
|
|
"--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
|
|
];
|
|
nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ];
|
|
postInstall = ''
|
|
wrapProgram $out/bin/xcalc \
|
|
--set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults
|
|
'';
|
|
});
|
|
|
|
# convert Type1 vector fonts to OpenType fonts
|
|
fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: {
|
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ];
|
|
|
|
postBuild = ''
|
|
# convert Postscript (Type 1) font to otf
|
|
for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do
|
|
name=$(basename $i | cut -d. -f1)
|
|
fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")"
|
|
done
|
|
'';
|
|
|
|
postInstall = ''
|
|
# install the otf fonts
|
|
fontDir="$out/lib/X11/fonts/misc/"
|
|
install -D -m 644 -t "$fontDir" *.otf
|
|
mkfontscale "$fontDir"
|
|
'';
|
|
});
|
|
|
|
}
|
|
|
|
# mark some packages as unfree
|
|
// (
|
|
let
|
|
# unfree but redistributable
|
|
redist = [
|
|
"fontadobeutopiatype1"
|
|
"fontadobeutopia100dpi"
|
|
"fontadobeutopia75dpi"
|
|
"fontbhtype1"
|
|
"fontibmtype1"
|
|
"fontbhttf"
|
|
"fontbh100dpi"
|
|
"fontbh75dpi"
|
|
];
|
|
|
|
# unfree, possibly not redistributable
|
|
unfree = [
|
|
# no license, just a copyright notice
|
|
"fontbhlucidatypewriter100dpi"
|
|
"fontbhlucidatypewriter75dpi"
|
|
"fontdaewoomisc"
|
|
|
|
# unclear license, "permission to use"?
|
|
"fontjismisc"
|
|
];
|
|
|
|
setLicense = license: name:
|
|
super.${name}.overrideAttrs (attrs: {
|
|
meta = attrs.meta // { inherit license; };
|
|
});
|
|
mapNamesToAttrs = f: names: with lib;
|
|
listToAttrs (zipListsWith nameValuePair names (map f names));
|
|
|
|
in
|
|
mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist //
|
|
mapNamesToAttrs (setLicense lib.licenses.unfree) unfree
|
|
)
|