diff options
Diffstat (limited to 'pkgs/applications/science/electronics/xoscope')
| -rw-r--r-- | pkgs/applications/science/electronics/xoscope/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/xoscope/gtkdepre.diff | 58 |
2 files changed, 17 insertions, 67 deletions
diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 5052a3715ef4..7a9f58a0c6e3 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,18 +1,26 @@ -{lib, stdenv, fetchurl, gtk2, pkg-config}: +{ lib +, stdenv +, fetchurl +, gtk3 +, gtkdatabox +, fftw +, gnum4 +, comedilib +, alsa-lib +, pkg-config +}: stdenv.mkDerivation rec { - name = "xoscope-2.0"; + pname = "xoscope"; + version = "2.3"; src = fetchurl { - url = "mirror://sourceforge/xoscope/${name}.tgz"; - sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; + url = "mirror://sourceforge/xoscope/${pname}-${version}.tar.gz"; + sha256 = "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - - # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 - patches = [ ./gtkdepre.diff ]; + nativeBuildInputs = [ pkg-config gnum4 ]; + buildInputs = [ gtk3 gtkdatabox fftw comedilib alsa-lib ]; meta = { description = "Oscilloscope through the sound card"; diff --git a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff b/pkgs/applications/science/electronics/xoscope/gtkdepre.diff deleted file mode 100644 index 993df9cb5503..000000000000 --- a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff +++ /dev/null @@ -1,58 +0,0 @@ -diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c ---- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200 -+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200 -@@ -661,7 +661,7 @@ - static void - gtk_databox_calculate_hcanvas (GtkDatabox *box) - { -- if (!GTK_WIDGET_VISIBLE (box)) -+ if (!gtk_widget_get_visible (box)) - return; - - if (box->priv->adjX->page_size == 1.0) -@@ -698,7 +698,7 @@ - static void - gtk_databox_calculate_vcanvas (GtkDatabox *box) - { -- if (!GTK_WIDGET_VISIBLE (box)) -+ if (!gtk_widget_get_visible (box)) - return; - - if (box->priv->adjY->page_size == 1.0) -@@ -780,7 +780,7 @@ - gtk_databox_draw (box, event); - - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], -+ widget->style->fg_gc[gtk_widget_get_state (widget)], - box->priv->canvas.pixmap, event->area.x, event->area.y, - event->area.x, event->area.y, event->area.width, - event->area.height); -@@ -940,7 +940,7 @@ - GtkWidget *widget = GTK_WIDGET (box); - - g_return_if_fail (GTK_IS_DATABOX (box)); -- g_return_if_fail (GTK_WIDGET_VISIBLE (widget)); -+ g_return_if_fail (gtk_widget_get_visible (widget)); - - gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0], - TRUE, 0, 0, -@@ -1150,7 +1150,7 @@ - /* Copy a part of the pixmap to the screen */ - if (pixmapCopyRect) - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (box)], -+ widget->style->fg_gc[gtk_widget_get_state (box)], - box->priv->canvas.pixmap, - pixmapCopyRect->x, - pixmapCopyRect->y, ---- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200 -+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200 -@@ -196,7 +196,6 @@ - -DG_DISABLE_DEPRECATED\ - -DGDK_DISABLE_DEPRECATED\ - -DGDK_PIXBUF_DISABLE_DEPRECATED\ -- -DGTK_DISABLE_DEPRECATED\ - `pkg-config gtk+-2.0 --cflags` - - all: all-am |