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

xorg: update autogeneration script

Browse Source 
* Fix shebang so that it's usable on NixOS;
* Enable warnings (they were enabled with Perl flag before);
* Switch from mesa to libGL.
This commit is contained in:
Nikolay Amiantov 2018-03-17 20:59:46 +03:00
parent 22671aa031
commit a798ec30f9
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
# THIS IS A GENERATED FILE. DO NOT EDIT! # THIS IS A GENERATED FILE. DO NOT EDIT!
args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol , libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol
, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
@ -1839,9 +1839,9 @@ let
sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; }) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videoark = (mkDerivation "xf86videoark" { xf86videoark = (mkDerivation "xf86videoark" {
name = "xf86-video-ark-0.7.5"; name = "xf86-video-ark-0.7.5";

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

@ -1,4 +1,4 @@
#! /usr/bin/perl -w #! /usr/bin/env perl
# Typical command to generate the list of tarballs: # Typical command to generate the list of tarballs:
@ -11,6 +11,7 @@
use strict; use strict;
use warnings;
my $tmpDir = "/tmp/xorg-unpack"; my $tmpDir = "/tmp/xorg-unpack";
@ -25,7 +26,7 @@ my %pcMap;
my %extraAttrs; my %extraAttrs;
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
$pcMap{$_} = $_ foreach @missingPCs; $pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype"; $pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng"; $pcMap{"libpng12"} = "libpng";
@ -33,7 +34,7 @@ $pcMap{"libpng"} = "libpng";
$pcMap{"dbus-1"} = "dbus"; $pcMap{"dbus-1"} = "dbus";
$pcMap{"uuid"} = "libuuid"; $pcMap{"uuid"} = "libuuid";
$pcMap{"libudev"} = "udev"; $pcMap{"libudev"} = "udev";
$pcMap{"gl"} = "mesa"; $pcMap{"gl"} = "libGL";
$pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "renderproto"; $pcMap{"\$RENDERPROTO"} = "renderproto";
$pcMap{"\$DRI3PROTO"} = "dri3proto"; $pcMap{"\$DRI3PROTO"} = "dri3proto";
@ -230,7 +231,7 @@ print OUT "";
print OUT <<EOF; print OUT <<EOF;
# THIS IS A GENERATED FILE. DO NOT EDIT! # THIS IS A GENERATED FILE. DO NOT EDIT!
args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol , libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol
, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;

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

@ -405,7 +405,7 @@ in
}; };
xdriinfo = attrs: attrs // { xdriinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [args.mesa]; buildInputs = attrs.buildInputs ++ [args.libGL];
}; };
xvinfo = attrs: attrs // { xvinfo = attrs: attrs // {
@ -465,7 +465,7 @@ in
version = (builtins.parseDrvName attrs.name).version; version = (builtins.parseDrvName attrs.name).version;
commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
commonPropagatedBuildInputs = [ commonPropagatedBuildInputs = [
args.zlib args.mesa args.dbus args.zlib args.libGL args.mesa_noglu args.dbus
xf86bigfontproto glproto xf86driproto xf86bigfontproto glproto xf86driproto
compositeproto scrnsaverproto resourceproto compositeproto scrnsaverproto resourceproto
xf86dgaproto xf86dgaproto
@ -494,7 +494,7 @@ in
if (!isDarwin) if (!isDarwin)
then { then {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = [ makeWrapper ] ++ commonBuildInputs; buildInputs = [ makeWrapper args.libdrm ] ++ commonBuildInputs;
propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
args.udev args.udev
]; ];

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

@ -12844,12 +12844,11 @@ with pkgs;
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
autoconf automake libtool mtdev pixman autoconf automake libtool mtdev pixman libGL
cairo epoxy; cairo epoxy;
inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; inherit (buildPackages) pkgconfig xmlto asciidoc flex bison;
inherit (darwin) apple_sdk cf-private libobjc; inherit (darwin) apple_sdk cf-private libobjc;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = libGL;
python = python2; # Incompatible with Python 3x python = python2; # Incompatible with Python 3x
udev = if stdenv.isLinux then udev else null; udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null; libdrm = if stdenv.isLinux then libdrm else null;