From 86e2b0e52b75a80be2c515612cdd50199043e516 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 28 Jun 2016 23:01:07 +0800
Subject: [PATCH 1/3] gtk3: 3.20.5 -> 3.20.6
---
pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index e6c95963865..4d6c22b418b 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -12,7 +12,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 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
- sha256 = "9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564";
+ sha256 = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2";
};
outputs = [ "dev" "out" ];
From d756aee6f6f38fac8980627f670b8ffadb20fe53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
<theophane.hufschmitt@polytechnique.org>
Date: Thu, 30 Jun 2016 10:06:20 +0200
Subject: [PATCH 2/3] Gtk : Enable wayland support on Linux
---
pkgs/development/libraries/gtk+/3.x.nix | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index e6c95963865..0662ed86013 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -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
@@ -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 = ''
From 17faf910b76841e7ad4b31036be86a0e309c274e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jun 2016 11:06:34 +0200
Subject: [PATCH 3/3] gnutls: fixup various problems
- disable a test that started failing due to date expiration, see #16610
- bash doesn't need adding
- defining patchPhase was overriding passed postPatch and patches
---
pkgs/development/libraries/gnutls/generic.nix | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 3af07f4c6f9..709da27e797 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -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);