diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-05 19:18:36 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-05 19:47:31 -0500 |
| commit | 7defda8356cc6444be2d40ff085dfee421a51a97 (patch) | |
| tree | 1a86add5c8f336952c085308f43c90402c2341e6 /pkgs/development/libraries/gtkmm | |
| parent | 185c41736aac3376c3dbcab72fdc7c531e9e7b84 (diff) | |
| download | nixpkgs-7defda8356cc6444be2d40ff085dfee421a51a97.tar nixpkgs-7defda8356cc6444be2d40ff085dfee421a51a97.tar.gz nixpkgs-7defda8356cc6444be2d40ff085dfee421a51a97.tar.bz2 nixpkgs-7defda8356cc6444be2d40ff085dfee421a51a97.tar.lz nixpkgs-7defda8356cc6444be2d40ff085dfee421a51a97.tar.xz nixpkgs-7defda8356cc6444be2d40ff085dfee421a51a97.tar.zst nixpkgs-7defda8356cc6444be2d40ff085dfee421a51a97.zip | |
gtkmm: fix build error by patching missing operator
Diffstat (limited to 'pkgs/development/libraries/gtkmm')
| -rw-r--r-- | pkgs/development/libraries/gtkmm/2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index b87b60c59da..422fdebd9c8 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; }; + 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 new file mode 100644 index 00000000000..c1e8cf59dde --- /dev/null +++ b/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch @@ -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; \ No newline at end of file |