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

gtkmm: fix build error by patching missing operator

Browse Source
This commit is contained in:
Thomas Tuegel 2016-10-05 19:18:36 -05:00
parent 185c41736a
commit 7defda8356
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gtkmm/2.x.nix
View File

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
}; };
patches = [ ./gtkmm-2.24.4-missing-operator.patch ];
nativeBuildInputs = [pkgconfig]; nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];

11
pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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<Gtk::MenuItem> 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;