From d73646d27042816fd245358018dab1b2e7c86281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Oct 2016 19:18:15 +0200 Subject: [PATCH] Revert "gtkmm: fix build error by patching missing operator" This reverts commit 7defda8356cc6444be2d40ff085dfee421a51a97. It breaks the package after update 61c467937b; (cherry picked from commit 72e013575239df40b3d16e23940fb48dcdc11dfb) --- pkgs/development/libraries/gtkmm/2.x.nix | 2 -- .../gtkmm/gtkmm-2.24.4-missing-operator.patch | 11 ----------- 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 014a919d1787..119e3f77f670 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; - patches = [ ./gtkmm-2.24.4-missing-operator.patch ]; - nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch b/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch deleted file mode 100644 index c1e8cf59dde1..000000000000 --- a/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtkmm-2.24.4/gtk/gtkmm/menushell.cc.orig 2016-08-26 21:55:08.858311055 +0000 -+++ gtkmm-2.24.4/gtk/gtkmm/menushell.cc 2016-08-26 21:55:33.206310578 +0000 -@@ -130,7 +130,7 @@ MenuList::iterator MenuList::insert(Menu - { - const Glib::RefPtr item = element.get_child(); - -- g_return_val_if_fail(item != 0, position); -+ g_return_val_if_fail(!!item, position); - g_return_val_if_fail(gparent() != 0, position); - - int pos = -1; \ No newline at end of file