diff options
Diffstat (limited to 'pkgs/servers')
37 files changed, 540 insertions, 291 deletions
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index e5c545c37bbb..3b67171a474e 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; }; - buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; prePatch = '' sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \ diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index d83e32bcb392..4b71aaeca3ad 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; }; - buildInputs = [ libusb pkgconfig pmutils udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb pmutils udev ]; # shell thing didn't work so i replaced it using nix prePatch = '' diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index d0b8567c7483..9c4bc4bda736 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; }; - buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl flex bison groff libxml2 utillinux libtool which ]; enableParallelBuilding = true; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 70deadb74e14..0e8d1e70bc70 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost openssl pkgconfig systemd + boost openssl systemd ] ++ optional enableLua [ lua luajit ] ++ optional enableProtoBuf protobuf; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index bcbb6bb120ef..8a669d78d57a 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "10p2m2zbydbd5xjdgf8z4zgvl8diyb4k3bq1hzsl32r71daj3yk0"; }; - buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 7ff0584818da..84c24e684786 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - buildInputs = [ autoreconfHook systemd fcgi pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd fcgi ]; # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd postPatch = '' diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index ecf9ee9d84a4..93fe205a8f9d 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -5,7 +5,6 @@ , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 -, fetchpatch }: let optional = stdenv.lib.optional; @@ -17,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.27"; + version = "2.4.28"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; + sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666"; }; # FIXME: -dev depends on -doc @@ -40,15 +39,6 @@ stdenv.mkDerivation rec { sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" ''; - patches = [ - (fetchpatch { - name = "CVE-2017-9798.patch"; - url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch"; - sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k"; - stripLen = 3; - }) - ]; - # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index a99f081b24eb..8a773631ee6c 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { ./fixdeps.patch ]; - buildInputs = [ apacheHttpd autoconf autoreconfHook automake curl glib lasso libtool libxml2 libxslt openssl pkgconfig xmlsec ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 80cbf12d2a6b..d681146eee5d 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - buildInputs = [ pkgconfig apacheHttpd avahi apr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ apacheHttpd avahi apr ]; patches = [ (fetchpatch { url = "http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/mod-dnssd/vivid/download/package-import%40ubuntu.com-20130530193334-kqebiy78q534or5k/portforapache2.4.pat-20130530222510-7tlw5btqchd04edb-3/port-for-apache2.4.patch"; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index e5f4ada33010..c3e15ed846db 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw"; }; - buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMysql mysql.lib; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index a4fd046e5696..b2c80b3f88fc 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; - buildInputs = [ gmp pkgconfig redland zlib librdf_raptor2 librdf_rasqal ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gmp redland zlib librdf_raptor2 librdf_rasqal ]; preConfigure = '' # Define _XOPEN_SOURCE to enable, e.g., getaddrinfo. diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index a2571600dfe7..637b7dd8b92b 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu + perl pam nspr nss openldap db cyrus_sasl svrcore icu net_snmp kerberos pcre ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index d503a4d7b571..b4cec18d030e 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ coreutils db openssl pcre perl ]; preBuild = '' sed ' diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index a96e4cb37c01..b4f671862f88 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz; sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; }; - buildInputs = [pkgconfig openssl lua5 curl readline bison expat]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl lua5 curl readline bison expat]; configurePhase = '' export WHERE=$prefix/ diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index a4186559e89f..8c00bcdbee25 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation { patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; - buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [git gperf pcre unbound libev tokyocabinet bash libsrs2]; postUnpack = '' cp -Rp ${libCommonSrc}/* ${srcRoot}/common; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 30c0681adb7d..1d0b5fb83362 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; - buildInputs = [ autoreconfHook file perl unzip openssl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ file perl unzip openssl ]; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index b8253cf0ad4f..afc6f4e31599 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -48,7 +48,8 @@ in -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c ''; - buildInputs = [ pkgconfig postgresql curl openssl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ]; postInstall = '' diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 6429d3fae53f..e951d3706e9d 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -57,7 +57,8 @@ in -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c ''; - buildInputs = [ pkgconfig postgresql curl openssl zlib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ] ++ stdenv.lib.optional enableSnmp net_snmp ++ stdenv.lib.optional enableSsh libssh2 ++ stdenv.lib.optional enableLdap openldap; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index cc54aa3b37aa..cd541f82d238 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -29,7 +29,8 @@ in configureFlags = "--enable-agent --enable-server --with-pgsql --with-libcurl"; - buildInputs = [ pkgconfig postgresql curl openssl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ]; postInstall = '' diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index e3e3de36575e..3a1e91b26eb0 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07dny1l8n46v0yn30zqa8bkyj8ay01xphc124nhf2sqwbff7nf2m"; }; - buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix index b2126a698336..27731af3803e 100644 --- a/pkgs/servers/openpts/default.nix +++ b/pkgs/servers/openpts/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/ patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ]; - buildInputs = [ autoconf automake pkgconfig libtool trousers openssl libxml2 libuuid gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool trousers openssl libxml2 libuuid gettext ]; preConfigure = '' substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index bd80560a0cb4..85ee3ddcf744 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ libsndfile speexdsp fftwFloat ] + [ libtool libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 18cd936e8fc5..c1d9655ef23a 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sed -i -e "s@ENV = dict.*@ENV = os.environ@g" SConstruct ''; - buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons openssl protobuf boost zlib ]; buildPhase = "scons"; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 17095750dbfd..ead0c095d5c9 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--enable-id64" ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index cad349c4b51f..2a36e1f67a26 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./shellinabox-minus.patch ]; - buildInputs = [ autoreconfHook pam openssl openssh makeWrapper ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pam openssl openssh makeWrapper ]; # Disable GSSAPIAuthentication errors. Also, paths in certain source files are # hardcoded. Replace the hardcoded paths with correct paths. diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 9f7e2b297ee3..9a1ea5b55800 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { --replace AS=\''${AS} AS=yasm ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - openssl ncurses curl pkgconfig gnutls readline perl libjpeg + openssl ncurses curl gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which lua libopus libsndfile ]; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 3395be9b9c1d..0ba5a3ee5adb 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; - buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ucommon libosip libexosip gnutls zlib ]; preConfigure = '' export configureFlags="--sysconfdir=$out/etc" diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8a3097ae9dee..cf3349dc1660 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -85,7 +85,6 @@ let license = licenses.postgresql; maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; - hydraPlatforms = platforms.linux; }; }); @@ -115,4 +114,10 @@ in { sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; }; + postgresql100 = common { + version = "10.0"; + psqlSchema = "10.0"; + sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"; + }; + } diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index edd99aa9a69b..78ad88bc9047 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; }; - buildInputs = [ postgresql pkgconfig libmsgpack groonga ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql libmsgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix index d434fa98e09b..c3a452132f28 100644 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg"; }; - nativebuildInputs = [ pkgconfig ]; + nativenativeBuildInputs = [ pkgconfig ]; buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 8b963e586632..851149ad7f71 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; - buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl pkgconfig python + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python which zlib ]; preConfigure = '' diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 8871c01e1a16..0ccf4c5bd0be 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; }; - buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; outputs = [ "out" "mod_example" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7c052d8ef49f..12ba110acbf5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -26,7 +26,8 @@ let url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2; sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -37,7 +38,8 @@ let url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; }; - buildInputs = [pkgconfig libX11 xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXt ;}; @@ -48,7 +50,8 @@ let url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; }; - buildInputs = [pkgconfig libXfont ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXfont ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont ;}; @@ -59,7 +62,8 @@ let url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2; sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -70,7 +74,8 @@ let url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2; sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -81,7 +86,8 @@ let url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2; sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -92,7 +98,8 @@ let url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2; sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -103,7 +110,8 @@ let url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2; sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -114,7 +122,8 @@ let url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -125,7 +134,8 @@ let url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -136,7 +146,8 @@ let url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; - buildInputs = [pkgconfig xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto ;}; @@ -147,7 +158,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -158,7 +170,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -169,7 +182,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -180,7 +194,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -191,7 +206,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -202,7 +218,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -213,7 +230,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -224,7 +242,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -235,7 +254,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -246,7 +266,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -257,7 +278,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -268,7 +290,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -279,7 +302,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -290,7 +314,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -301,7 +326,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -312,7 +338,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -323,7 +350,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -334,7 +362,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -345,7 +374,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -356,7 +386,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -367,7 +398,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -378,7 +410,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -389,7 +422,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -400,7 +434,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -411,7 +446,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -422,7 +458,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -433,7 +470,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -444,7 +482,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -455,7 +494,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -466,7 +506,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -477,7 +518,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -488,7 +530,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -499,7 +542,8 @@ let url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -510,7 +554,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -521,7 +566,8 @@ let url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2; sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -532,7 +578,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -543,7 +590,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -554,7 +602,8 @@ let url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -565,7 +614,8 @@ let url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2; sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -576,7 +626,8 @@ let url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; - buildInputs = [pkgconfig libICE xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE xproto ;}; @@ -587,7 +638,8 @@ let url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -598,7 +650,8 @@ let url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -609,7 +662,8 @@ let url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2; sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -620,7 +674,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; - buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ applewmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit applewmproto libX11 libXext xextproto ;}; @@ -631,7 +686,8 @@ let url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; }; - buildInputs = [pkgconfig fontsproto xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto xproto xtrans ;}; @@ -642,7 +698,8 @@ let url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2; sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"; }; - buildInputs = [pkgconfig xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto xtrans ;}; @@ -653,7 +710,8 @@ let url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; }; - buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libuuid xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libuuid xproto xtrans ;}; @@ -664,7 +722,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; - buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ windowswmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit windowswmproto libX11 libXext xextproto ;}; @@ -675,7 +734,8 @@ let url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2; sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d"; }; - buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -686,7 +746,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; - buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scrnsaverproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit scrnsaverproto libX11 libXext xextproto ;}; @@ -697,7 +758,8 @@ let url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -708,7 +770,8 @@ let url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; - buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; @@ -719,7 +782,8 @@ let url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; }; - buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ compositeproto libX11 libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit compositeproto libX11 libXfixes xproto ;}; @@ -730,7 +794,8 @@ let url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2; sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"; }; - buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -741,7 +806,8 @@ let url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; }; - buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; @@ -752,7 +818,8 @@ let url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -763,7 +830,8 @@ let url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; - buildInputs = [pkgconfig libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xextproto xproto ;}; @@ -774,7 +842,8 @@ let url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2; sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv"; }; - buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fixesproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 xextproto xproto ;}; @@ -785,7 +854,8 @@ let url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2; sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502"; }; - buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -796,7 +866,8 @@ let url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; }; - buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -807,7 +878,8 @@ let url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; }; - buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontconfig freetype libX11 xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; @@ -818,7 +890,8 @@ let url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2; sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"; }; - buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; @@ -829,7 +902,8 @@ let url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xineramaproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xineramaproto ;}; @@ -840,7 +914,8 @@ let url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -851,7 +926,8 @@ let url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2; sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; - buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ printproto libX11 libXau libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit printproto libX11 libXau libXext xextproto ;}; @@ -862,7 +938,8 @@ let url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -873,7 +950,8 @@ let url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; - buildInputs = [pkgconfig presentproto libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ presentproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit presentproto libX11 xextproto xproto ;}; @@ -884,7 +962,8 @@ let url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; }; - buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -895,7 +974,8 @@ let url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; - buildInputs = [pkgconfig renderproto libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ renderproto libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit renderproto libX11 xproto ;}; @@ -906,7 +986,8 @@ let url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; }; - buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; @@ -917,7 +998,8 @@ let url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2; sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6"; }; - buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE kbproto libSM libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -928,7 +1010,8 @@ let url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; - buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; @@ -939,7 +1022,8 @@ let url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ videoproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto ;}; @@ -950,7 +1034,8 @@ let url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; @@ -961,7 +1046,8 @@ let url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; @@ -972,7 +1058,8 @@ let url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; @@ -983,7 +1070,8 @@ let url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2; sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; @@ -994,7 +1082,8 @@ let url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; - buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dmxproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dmxproto libX11 libXext xextproto ;}; @@ -1005,7 +1094,8 @@ let url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; }; - buildInputs = [pkgconfig xproto zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto zlib ;}; @@ -1016,7 +1106,8 @@ let url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2; sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"; }; - buildInputs = [pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit zlib ;}; @@ -1027,7 +1118,8 @@ let url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1038,7 +1130,8 @@ let url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; - buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1049,7 +1142,8 @@ let url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; }; - buildInputs = [pkgconfig kbproto libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ kbproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit kbproto libX11 ;}; @@ -1060,7 +1154,8 @@ let url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1071,7 +1166,8 @@ let url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1082,7 +1178,8 @@ let url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; - buildInputs = [pkgconfig libfontenc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc ;}; @@ -1093,7 +1190,8 @@ let url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1104,7 +1202,8 @@ let url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2; sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1115,7 +1214,8 @@ let url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; - buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc freetype xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc freetype xproto zlib ;}; @@ -1126,7 +1226,8 @@ let url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2; sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1137,7 +1238,8 @@ let url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; }; - buildInputs = [pkgconfig libXau ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXau ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXau ;}; @@ -1148,7 +1250,8 @@ let url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2; sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1159,7 +1262,8 @@ let url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2; sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1170,7 +1274,8 @@ let url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2; sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1181,7 +1286,8 @@ let url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2; sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1192,7 +1298,8 @@ let url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2; sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1203,7 +1310,8 @@ let url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1214,7 +1322,8 @@ let url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -1225,7 +1334,8 @@ let url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; - buildInputs = [pkgconfig libICE libSM libXmu libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libXmu libXt ;}; @@ -1236,7 +1346,8 @@ let url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; }; - buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; @@ -1247,7 +1358,8 @@ let url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2; sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1258,7 +1370,8 @@ let url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1269,7 +1382,8 @@ let url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1280,7 +1394,8 @@ let url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; }; - buildInputs = [pkgconfig libX11 libXext libXft libXmu xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; @@ -1291,7 +1406,8 @@ let url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2; sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"; }; - buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXext libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXext libXmu xproto ;}; @@ -1302,7 +1418,8 @@ let url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2; sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp"; }; - buildInputs = [pkgconfig libxcb xcbutil ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb xcbutil ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb xcbutil ;}; @@ -1313,7 +1430,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1324,7 +1442,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; - buildInputs = [pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit python ;}; @@ -1335,7 +1454,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1346,7 +1466,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; @@ -1357,7 +1478,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbproto xproto ;}; @@ -1368,7 +1490,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutil xproto ;}; @@ -1379,7 +1502,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1390,7 +1514,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1401,7 +1526,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1412,7 +1538,8 @@ let url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; }; - buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;}; @@ -1423,7 +1550,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2; sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1434,7 +1562,8 @@ let url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; - buildInputs = [pkgconfig libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 ;}; @@ -1445,7 +1574,8 @@ let url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; }; - buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;}; @@ -1456,7 +1586,8 @@ let url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; }; - buildInputs = [pkgconfig libpng libX11 libXcursor ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpng libX11 libXcursor ;}; @@ -1467,7 +1598,8 @@ let url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; }; - buildInputs = [pkgconfig libXcursor ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcursor ;}; @@ -1478,7 +1610,8 @@ let url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; }; - buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; @@ -1489,7 +1622,8 @@ let url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; - buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; @@ -1500,7 +1634,8 @@ let url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; }; - buildInputs = [pkgconfig glproto libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit glproto libX11 ;}; @@ -1511,7 +1646,8 @@ let url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; }; - buildInputs = [pkgconfig libX11 xproto libXrandr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr ;}; @@ -1522,7 +1658,8 @@ let url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2; sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1533,7 +1670,8 @@ let url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2; sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"; }; - buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu libXrender libXt ;}; @@ -1544,7 +1682,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1555,7 +1694,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1566,7 +1706,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2; sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1577,7 +1718,8 @@ let url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; - buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev xorgserver xproto ;}; @@ -1588,7 +1730,8 @@ let url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; - buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; @@ -1599,7 +1742,8 @@ let url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1610,7 +1754,8 @@ let url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1621,7 +1766,8 @@ let url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1632,7 +1778,8 @@ let url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; - buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1643,7 +1790,8 @@ let url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2; sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; - buildInputs = [pkgconfig inputproto udev randrproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto udev randrproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev randrproto xorgserver xproto ;}; @@ -1654,7 +1802,8 @@ let url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -1665,18 +1814,20 @@ let url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2; sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.3.0"; + name = "xf86-video-amdgpu-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; - sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2; + sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; - buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1687,7 +1838,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; - buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; @@ -1698,7 +1850,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1709,7 +1862,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1720,7 +1874,8 @@ let url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1731,7 +1886,8 @@ let url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1742,7 +1898,8 @@ let url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1753,7 +1910,8 @@ let url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; @@ -1764,7 +1922,8 @@ let url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1775,7 +1934,8 @@ let url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; - buildInputs = [pkgconfig xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto xorgserver xproto ;}; @@ -1786,7 +1946,8 @@ let url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; - buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1797,7 +1958,8 @@ let url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1808,18 +1970,20 @@ let url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2017-04-18"; + name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz; - sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; + sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; @@ -1830,7 +1994,8 @@ let url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1841,7 +2006,8 @@ let url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1852,7 +2018,8 @@ let url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; }; - buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xorgserver xproto ;}; @@ -1863,7 +2030,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; @@ -1874,7 +2042,8 @@ let url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1885,7 +2054,8 @@ let url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1896,7 +2066,8 @@ let url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; @@ -1907,7 +2078,8 @@ let url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1918,7 +2090,8 @@ let url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; @@ -1929,7 +2102,8 @@ let url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -1940,7 +2114,8 @@ let url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1951,7 +2126,8 @@ let url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1962,7 +2138,8 @@ let url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; - buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; @@ -1973,7 +2150,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -1984,7 +2162,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; @@ -1995,7 +2174,8 @@ let url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2006,7 +2186,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; @@ -2017,7 +2198,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2028,7 +2210,8 @@ let url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -2039,7 +2222,8 @@ let url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2050,7 +2234,8 @@ let url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2061,7 +2246,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; - buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ randrproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto videoproto xorgserver xproto ;}; @@ -2072,7 +2258,8 @@ let url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2; sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -2083,7 +2270,8 @@ let url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; @@ -2094,7 +2282,8 @@ let url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2105,7 +2294,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -2116,7 +2306,8 @@ let url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -2127,7 +2318,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2138,7 +2330,8 @@ let url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; }; - buildInputs = [pkgconfig libXfont xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXfont xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont xproto xtrans ;}; @@ -2149,7 +2342,8 @@ let url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; - buildInputs = [pkgconfig libX11 xproto libXxf86vm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXxf86vm ;}; @@ -2160,7 +2354,8 @@ let url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; - buildInputs = [pkgconfig libXaw libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2171,7 +2366,8 @@ let url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; }; - buildInputs = [pkgconfig libX11 libXau libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXmu xproto ;}; @@ -2182,7 +2378,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2; sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2193,7 +2390,8 @@ let url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2; sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2204,7 +2402,8 @@ let url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2; sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n"; }; - buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; @@ -2215,7 +2414,8 @@ let url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; }; - buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2226,7 +2426,8 @@ let url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -2237,7 +2438,8 @@ let url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; - buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2248,7 +2450,8 @@ let url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; - buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXaw xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXaw xproto libXt ;}; @@ -2259,7 +2462,8 @@ let url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2; sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2270,7 +2474,8 @@ let url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2281,7 +2486,8 @@ let url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; }; - buildInputs = [pkgconfig libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2292,7 +2498,8 @@ let url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; }; - buildInputs = [pkgconfig libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2303,7 +2510,8 @@ let url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2314,7 +2522,8 @@ let url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; - buildInputs = [pkgconfig libX11 libXaw libXmu libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXmu libXt ;}; @@ -2325,7 +2534,8 @@ let url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; }; - buildInputs = [pkgconfig libXaw libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2336,7 +2546,8 @@ let url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2347,7 +2558,8 @@ let url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2358,7 +2570,8 @@ let url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2; sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2369,7 +2582,8 @@ let url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; @@ -2380,7 +2594,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2391,7 +2606,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2402,7 +2618,8 @@ let url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2413,7 +2630,8 @@ let url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2; sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2424,7 +2642,8 @@ let url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; - buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr libXrender ;}; @@ -2435,7 +2654,8 @@ let url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2446,7 +2666,8 @@ let url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2457,7 +2678,8 @@ let url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; }; - buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; @@ -2468,7 +2690,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; - buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xbitmaps libXcursor libXmu ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xbitmaps libXcursor libXmu ;}; @@ -2479,7 +2702,8 @@ let url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2490,7 +2714,8 @@ let url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; }; - buildInputs = [pkgconfig libX11 xproto libXv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXv ;}; @@ -2501,7 +2726,8 @@ let url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2512,7 +2738,8 @@ let url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; }; - buildInputs = [pkgconfig libX11 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxcb xproto ;}; @@ -2523,7 +2750,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 74c5ae9d9b89..1f3557dff66e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -281,7 +281,8 @@ foreach my $pkg (sort (keys %pkgURLs)) { url = $pkgURLs{$pkg}; sha256 = "$pkgHashes{$pkg}"; }; - buildInputs = [pkgconfig $inputs];$extraAttrs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ $inputs];$extraAttrs meta.platforms = stdenv.lib.platforms.unix; }) // {inherit $inputs;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2f2270d536d2..45df7244176d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -71,13 +71,13 @@ in }; libxcb = attrs : attrs // { - nativeBuildInputs = [ args.python ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; configureFlags = "--enable-xkb --enable-xinput"; outputs = [ "out" "dev" "man" "doc" ]; }; xcbproto = attrs : attrs // { - nativeBuildInputs = [ args.python ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; }; libX11 = attrs: attrs // { @@ -398,11 +398,6 @@ in let attrs = with args; if (args.abiCompat == null) then attrs_passed - # All this just for 1.19.2, as the tarball is incorrectly autotoolized. - // { - nativeBuildInputs = [ utilmacros fontutil ]; - preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi"; - } else if (args.abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh; @@ -410,7 +405,8 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else if (args.abiCompat == "1.18") then { name = "xorg-server-1.18.4"; @@ -419,7 +415,8 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; @@ -539,7 +536,7 @@ in }; twm = attrs: attrs // { - nativeBuildInputs = [args.bison args.flex]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex]; }; xcursorthemes = attrs: attrs // { @@ -566,7 +563,7 @@ in xf86videointel = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; - nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; configureFlags = "--with-default-dri=3 --enable-tools"; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8d9b66f21aef..362ca3f2e7e9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 060a6b18a897..dfc90feeb33d 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l"; }; - buildInputs = [ pkgconfig m4 libxcb xcbutil ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ m4 libxcb xcbutil ] ++ stdenv.lib.optional doCheck libX11; doCheck = true; |