nemiver: clean up (#68333)

nemiver: clean up

pkgs/desktops/gnome-3/default.nix

@@ -231,8 +231,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
 
-  nemiver = callPackage ./devtools/nemiver { };
-
 #### Games
 
   aisleriot = callPackage ./games/aisleriot { };
@@ -345,6 +343,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) gnome-video-effects; # added 2019-08-19
   inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
   inherit (pkgs) glib-networking; # added 2019-09-02
+  inherit (pkgs) nemiver; # added 2019-09-09
 
   defaultIconTheme = adwaita-icon-theme;
   gtk = gtk3;

pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch

@@ -1,13 +0,0 @@
---- a/src/dbgengine/nmv-dbg-common.h	2014-07-09 10:36:05.000000000 +0200
-+++ b/src/dbgengine/nmv-dbg-common.h	2016-08-04 22:40:28.447842746 +0200
-@@ -171,7 +171,9 @@
- 
-     bool has_slot () const
-     {
--        return m_slot;
-+        //return m_slot;
-+        // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502
-+        return static_cast<bool> (m_slot);
-     }
- 
-     template<class T>

pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch

@@ -1,10 +0,0 @@
---- a/src/confmgr/nmv-gconf-mgr.cc	2014-07-08 10:24:06.000000000 +0200
-+++ b/src/confmgr/nmv-gconf-mgr.cc	2016-08-04 23:50:08.143060464 +0200
-@@ -32,6 +32,7 @@
- NEMIVER_BEGIN_NAMESPACE (nemiver)
- 
- using nemiver::common::GCharSafePtr;
-+using nemiver::common::GErrorSafePtr;
- 
- class GConfMgr : public IConfMgr {
-     GConfMgr (const GConfMgr &);

pkgs/development/tools/nemiver/default.nix

@@ -1,6 +1,24 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
-  boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas,
-  gtksourceviewmm, wrapGAppsHook }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, pkgconfig
+, gnome3
+, gtk3
+, libxml2
+, intltool
+, itstool
+, gdb
+, boost
+, sqlite
+, libgtop
+, glibmm
+, gtkmm3
+, vte
+, gtksourceview
+, gsettings-desktop-schemas
+, gtksourceviewmm
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "nemiver";
@@ -11,17 +29,38 @@ stdenv.mkDerivation rec {
     sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
   };
 
-  nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [
+    libxml2
+    intltool
+    itstool
+    pkgconfig
+    wrapGAppsHook
+  ];
 
   buildInputs = [
-    gtk3 gdb boost sqlite libgtop
-    glibmm gtkmm3 vte gtksourceview gtksourceviewmm
+    gtk3
+    gdb
+    boost
+    sqlite
+    libgtop
+    glibmm
+    gtkmm3
+    vte
+    gtksourceview
+    gtksourceviewmm
     gsettings-desktop-schemas
   ];
 
   patches = [
-    ./bool_slot.patch
-    ./safe_ptr.patch
+    # build fixes
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch;
+      sha256 = "1g0ixll6yqfj6ysf50p0c7nmh3lgmb6ds15703q7ibnw7dyidvj8";
+    })
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch;
+      sha256 = "1mxb1sdqdj7dm204gja8cdygx8579bjriqqbb7cna9rj0m9c8pjg";
+    })
     (fetchpatch {
       url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
       sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
@@ -35,7 +74,6 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "nemiver";
-      attrPath = "gnome3.nemiver";
       versionPolicy = "none";
     };
   };

pkgs/top-level/all-packages.nix

@@ -4916,6 +4916,8 @@ in
 
   ndppd = callPackage ../applications/networking/ndppd { };
 
+  nemiver = callPackage ../development/tools/nemiver { };
+
   neofetch = callPackage ../tools/misc/neofetch { };
 
   nerdfonts = callPackage ../data/fonts/nerdfonts { };