dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xorg: simplify overrides now handled automatically, GL -> libGL

Browse Source
This commit is contained in:
Will Dietz 2019-03-18 23:40:37 -05:00
parent 108ab954ed
commit 8d31888648
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/x11/xorg/default.nix
View File

@ -1625,7 +1625,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation {
xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation {
name = "xdriinfo-1.0.6";
builder = ./builder.sh;
src = fetchurl {
@ -1634,7 +1634,7 @@ lib.makeScope newScope (self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ xorgproto libX11 ];
buildInputs = [ libGL xorgproto libX11 ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

1
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -35,6 +35,7 @@ $pcMap{"dbus-1"} = "dbus";
$pcMap{"uuid"} = "libuuid";
$pcMap{"libudev"} = "udev";
$pcMap{"gl"} = "libGL";
$pcMap{"GL"} = "libGL";
$pcMap{"gbm"} = "mesa_noglu";
$pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "xorgproto";

12
pkgs/servers/x11/xorg/overrides.nix
View File

@ -50,10 +50,6 @@ self: super:
meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
});
fontcursormisc = super.fontcursormisc.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
});
fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
postInstall =
''
@ -291,10 +287,6 @@ self: super:
meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; };
});
oclock = super.oclock.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.libxkbfile ];
});
setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
postInstall =
''
@ -340,7 +332,6 @@ self: super:
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=\${out}/include/xorg";
buildInputs = attrs.buildInputs ++ [ mtdev libevdev ];
});
xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
@ -353,7 +344,6 @@ self: super:
xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {
outputs = [ "out" "dev" ];
buildInputs = attrs.buildInputs ++ [ libinput ];
installFlags = "sdkdir=\${dev}/include/xorg";
});
@ -692,7 +682,7 @@ self: super:
});
xwd = super.xwd.overrideAttrs (attrs: {
buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile];
buildInputs = with self; attrs.buildInputs ++ [libXt];
});
xrdb = super.xrdb.overrideAttrs (attrs: {