diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-20 19:56:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 14:40:49 +0000 |
commit | 36bedbe5c162bab9e7ef702f353ae399fdfd0518 (patch) | |
tree | fb2926eee09fe0714683074758276739e9e5cda9 /nixpkgs/pkgs/desktops/gnome-3/devtools | |
parent | 47852a9ef0e62a2d565f9ec0fba2a3ae77c44221 (diff) | |
parent | 262b328b0bad0c4b97ed495679208e4a2eb87704 (diff) | |
download | nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.gz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.bz2 nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.lz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.xz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.zst nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.zip |
Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/devtools')
3 files changed, 0 insertions, 73 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch deleted file mode 100644 index 83423122110c..000000000000 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch +++ /dev/null @@ -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> diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix deleted file mode 100644 index 7ebacc99c522..000000000000 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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"; - version = "0.9.6"; - - src = fetchurl { - url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; - }; - - nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ]; - - buildInputs = [ - gtk3 gdb boost sqlite libgtop - glibmm gtkmm3 vte gtksourceview gtksourceviewmm - gsettings-desktop-schemas - ]; - - patches = [ - ./bool_slot.patch - ./safe_ptr.patch - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch; - sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; - }) - ]; - - configureFlags = [ - "--enable-gsettings" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "nemiver"; - attrPath = "gnome3.nemiver"; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nemiver; - description = "Easy to use standalone C/C++ debugger"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.juliendehos ]; - }; -} diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch deleted file mode 100644 index e3413b224977..000000000000 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch +++ /dev/null @@ -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 &); |