4 files changed, 37 insertions, 55 deletions
diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
deleted file mode 100644
index 29cecb169998..000000000000
--- a/pkgs/applications/audio/beast/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
-, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
-
-stdenv.mkDerivation rec {
-  name = "beast-0.7.1";
-
-  src = fetchurl {
-    url = "https://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2";
-    sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
-  };
-
-  buildInputs =
-    [ zlib guile libart_lgpl pkgconfig intltool gtk2 glib
-      libogg libvorbis libgnomecanvas gettext
-    ];
-
-  patchPhase = ''
-    unset patchPhase; patchPhase
-    sed 's=-DG_DISABLE_DEPRECATED==g' -i `find -type f` # the patches didn't remove all occurences
-    sed 's=/bin/bash=/${stdenv.shell}=g' -i `find -type f`
-    sed 's=/usr/bin/perl=/${perl}/bin/perl=g' -i `find -type f`
-  '';
-
-  patches =
-    [ (fetchurl {
-        url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
-        sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
-      })
-      ./patch.patch # patches taken from gentoo
-    ];
-
-  meta = with stdenv.lib; {
-    description = "A music composition and modular synthesis application";
-    homepage = http://beast.gtk.org;
-    license = with licenses; [ gpl2 lgpl21 ];
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index d2ec92e0654a..bf45a466d30d 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -1,25 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }:
+{ stdenv
+, fetchurl
+, pkg-config
+, intltool
+, gtk3
+, wrapGAppsHook
+, alsaLib
+, libpulseaudio
+, fftw
+}:
 
-stdenv.mkDerivation {
-  name = "lingot-0.9.1";
+stdenv.mkDerivation rec {
+  pname = "lingot";
+  version = "1.0.1";
 
   src = fetchurl {
-    url = mirror://savannah/lingot/lingot-0.9.1.tar.gz;
-    sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc";
+    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "cbjHe7mI6DhKDsv0yGHYOPe5hShKjhj3VTKrmBbGoA8=";
   };
 
-  hardeningDisable = [ "format" ];
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+    wrapGAppsHook
+  ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gtk2 alsaLib libglade ];
+  buildInputs = [
+    gtk3
+    alsaLib
+    libpulseaudio
+    fftw
+  ];
 
-  configureFlags = [ "--disable-jack" ];
+  configureFlags = [
+    "--disable-jack"
+  ];
 
   meta = {
     description = "Not a Guitar-Only tuner";
-    homepage = https://www.nongnu.org/lingot/;
+    homepage = "https://www.nongnu.org/lingot/";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric ];
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index a7d8f4c7d40f..9517a4404def 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -3,8 +3,8 @@
 , libxml2, db, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
-, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
+, openssl, gperf, cppunit, poppler, utillinux
+, librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -347,13 +347,13 @@ in (stdenv.mkDerivation rec {
   buildInputs = with xorg;
     [ ant ArchiveZip boost cairo clucene_core
       IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
-      freetype GConf getopt gnome_vfs gperf gtk3 gtk2
+      freetype getopt gperf gtk3 gtk2
       hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer
       gst_all_1.gst-plugins-base glib libmysqlclient
-      neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
+      neon nspr nss openldap openssl pam perl pkgconfig poppler
       python3 sane-backends unzip vigra which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
       libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index c23feec6f436..03b98694eaf3 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper
+{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib
 , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
 }:
 # We need an old version of Graphviz for format compatibility reasons.
@@ -7,7 +7,7 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
       inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
         yacc libtool fontconfig pango gd libwebp;
     }; in
-let inherit (gnome2) libgnomecanvas glib; in
+let inherit (gnome2) libgnomecanvas; in
 let inherit (ocamlPackages) ocaml lablgtk camlp4; in
 stdenv.mkDerivation rec {
   version = "1.0.2";