Merge branch 'staging'

This commit is contained in:
Vladimír Čunát 2016-07-01 12:42:05 +02:00
commit a441a7c257
2 changed files with 17 additions and 10 deletions

View file

@ -11,11 +11,17 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation {
name = "gnutls-${version}";
inherit src patches postPatch;
inherit src patches;
outputs = [ "dev" "out" "bin" "man" "docdev" ];
outputInfo = "docdev";
postPatch = ''
sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
-i tests/cert-tests/name-constraints
'' + postPatch;
preConfigure = "patchShebangs .";
configureFlags =
lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
++ [
@ -29,7 +35,7 @@ stdenv.mkDerivation {
# for the actual fix.
enableParallelBuilding = !guileBindings;
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools bash ]
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools ]
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ]
@ -37,10 +43,6 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
patchPhase = ''
patchShebangs .
'';
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);

View file

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
, xorg, wayland, epoxy, json_glib, libxkbcommon, gmp
, xorg, epoxy, json_glib, libxkbcommon, gmp
, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux, cups ? null
, darwin
@ -12,7 +13,7 @@ with stdenv.lib;
let
ver_maj = "3.20";
ver_min = "5";
ver_min = "6";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564";
sha256 = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2";
};
outputs = [ "dev" "out" ];
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with xorg; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optionals stdenv.isLinux [ wayland ]
++ optionals waylandSupport [ wayland wayland-protocols ]
++ optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
@ -53,6 +54,10 @@ stdenv.mkDerivation rec {
"--disable-glibtest"
"--with-gdktarget=quartz"
"--enable-quartz-backend"
] ++ optional stdenv.isLinux [
"--enable-x11-backend"
] ++ optional waylandSupport [
"--enable-wayland-backend"
];
postInstall = ''