diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-05-13 19:34:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-13 19:34:18 +0100 |
commit | 8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c (patch) | |
tree | 52b0cc607b9baf16f3bc576b8e01788dbbd2846d /pkgs/servers | |
parent | 642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f (diff) | |
parent | 991f8db51a6e2d75a4ec774f1de95fbe99a476ef (diff) | |
download | nixlib-8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c.tar nixlib-8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c.tar.gz nixlib-8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c.tar.bz2 nixlib-8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c.tar.lz nixlib-8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c.tar.xz nixlib-8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c.tar.zst nixlib-8cdbdfb3edd09b3f4cd56ca75fa001b9bc9b4e6c.zip |
Merge pull request #40438 from Mic92/xorgserver
xorg.xorgserver: fix build by adding mesa_noglu for dri package
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ce78eba4b432..23aae1134837 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -476,8 +476,6 @@ in dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto libXfont2 ]; - # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 - commonPatches = [ ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. darwinOtherX = overrideDerivation xorgserver (oldAttrs: { @@ -494,11 +492,10 @@ in if (!isDarwin) then { outputs = [ "out" "dev" ]; - buildInputs = [ makeWrapper args.libdrm ] ++ commonBuildInputs; + buildInputs = commonBuildInputs ++ [ makeWrapper args.libdrm args.mesa_noglu ]; propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ args.udev ]; - patches = commonPatches; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; @@ -515,6 +512,7 @@ in ] ++ 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 @@ -538,7 +536,7 @@ in ]; # XQuartz patchset - patches = commonPatches ++ [ + patches = [ (args.fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch"; sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k"; |