From 2ff2b89fdfa88fdf2880e609388f99026c1a1b5d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Sep 2018 23:45:29 +0200 Subject: gnome2.gconfmm: drop --- pkgs/desktops/gnome-2/default.nix | 2 -- pkgs/desktops/gnome-2/platform/gconfmm/default.nix | 23 ---------------------- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/platform/gconfmm/default.nix (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index c41183f4b24f..59a86236dba7 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -35,8 +35,6 @@ let overridden = set // overrides; set = with overridden; { GConf = callPackage ./platform/GConf { }; - gconfmm = callPackage ./platform/gconfmm { }; - libgnomecanvas = callPackage ./platform/libgnomecanvas { }; libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { }; diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix deleted file mode 100644 index 356d4df9d1d8..000000000000 --- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }: - -stdenv.mkDerivation rec { - name = "gconfmm-${minVer}.3"; - minVer = "2.28"; - - src = fetchurl { - url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2"; - sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ GConf gtkmm glibmm ]; - - meta = { - description = "C++ wrappers for GConf"; - - license = stdenv.lib.licenses.lgpl2Plus; - - platforms = stdenv.lib.platforms.linux; - }; -} -- cgit 1.4.1 From 8a0f255cda9c8ee026da922fd994d6cd8b49bfe3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 14 Sep 2018 01:42:42 +0200 Subject: gnome2.gtkglextmm: drop --- pkgs/desktops/gnome-2/default.nix | 2 - .../gnome-2/platform/gtkglextmm/default.nix | 35 ------ .../platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch | 121 --------------------- .../desktops/gnome-2/platform/gtkglextmm/gdk.patch | 15 --- 4 files changed, 173 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix delete mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch delete mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 59a86236dba7..f67dc13c8545 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -68,8 +68,6 @@ let overridden = set // overrides; set = with overridden; { gtkglext = callPackage ./platform/gtkglext { }; - gtkglextmm = callPackage ./platform/gtkglextmm { }; - #### DESKTOP gvfs = gvfs.override { gnome = self; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix deleted file mode 100644 index 63e33aa578ef..000000000000 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf -, pangox_compat, libXmu -}: - -stdenv.mkDerivation rec { - name = "gtkglextmm-${minVer}.0"; - minVer = "1.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2"; - sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea"; - }; - - patches = [ - ./gdk.patch - - # From debian, fixes build with newer gtk "[...] by switching #includes - # around so that the G_DISABLE_DEPRECATED trick in glibmm still works". - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356 - ./fix_ftbfs_gtk_2_36.patch - ]; - - buildInputs = [ pangox_compat libXmu ]; - - nativeBuildInputs = [pkgconfig]; - - propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ]; - - meta = { - description = "C++ wrappers for GtkGLExt"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch deleted file mode 100644 index 88e271e3eb7b..000000000000 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc -=================================================================== ---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -1,15 +1,8 @@ -- --#include -- - // Disable the 'const' function attribute of the get_type() functions. - // GCC would optimize them out because we don't use the return value. - #undef G_GNUC_CONST - #define G_GNUC_CONST /* empty */ - --#include --#include --#include -- - // #include the widget headers so that we can call the get_type() static methods: - - #include "tokens.h" -@@ -19,6 +12,12 @@ - #include "pixmap.h" - #include "window.h" - -+#include -+ -+#include -+#include -+#include -+ - extern "C" - { - -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc -=================================================================== ---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -17,10 +17,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include -- - #include "query.h" - -+#include -+ - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc -=================================================================== ---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -17,11 +17,11 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -+#include "pixmapext.h" -+ - #include - #include - --#include "pixmapext.h" -- - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc -=================================================================== ---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -17,11 +17,11 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -+#include "windowext.h" -+ - #include - #include - --#include "windowext.h" -- - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc -=================================================================== ---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200 -+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200 -@@ -17,10 +17,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include -- - #include "font.h" - -+#include -+ - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc -=================================================================== ---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100 -+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200 -@@ -19,11 +19,11 @@ - - #include - --#include -- - #include "wrap_init.h" - #include "init.h" - -+#include -+ - namespace Gdk - { - namespace GL diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch deleted file mode 100644 index 8a39b521d63c..000000000000 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch +++ /dev/null @@ -1,15 +0,0 @@ -# fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621976 -# reference: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg250570.html ---- gtkglextmm-1.2.0-orig/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 -+++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 -@@ -17,9 +17,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include -- - #include "widget.h" -+#include - - namespace Gtk - { \ No newline at end of file -- cgit 1.4.1 From c32b0409a9f1ba42dcf355838ab751390be55674 Mon Sep 17 00:00:00 2001 From: Tor Hedin Brønner Date: Mon, 20 Aug 2018 17:03:55 +0200 Subject: pipewire: 0.1.9 -> 0.2.3 I also removed pipewire from mutter temporarily, since it is not compatible. --- pkgs/desktops/gnome-3/core/mutter/default.nix | 2 +- pkgs/development/libraries/pipewire/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 631107fe7a80..b05644366dc0 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-x" "--disable-static" - "--enable-remote-desktop" + # "--enable-remote-desktop" "--enable-shape" "--enable-sm" "--enable-startup-notification" diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index e87ed8e48a98..96b5239b7dbe 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, libv4l, alsaLib, ffmpeg, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf, freefont_ttf }: let - version = "0.1.9"; + version = "0.2.3"; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; @@ -16,22 +16,22 @@ in stdenv.mkDerivation rec { owner = "PipeWire"; repo = "pipewire"; rev = version; - sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm"; + sha256 = "1y04brfi5bv4y0hdyqzrcbayr674njf6a5hiwjfv2yi6lazkqv1k"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "lib" "dev" "doc" ]; nativeBuildInputs = [ meson ninja pkgconfig doxygen graphviz valgrind ]; buildInputs = [ - glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils + glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer libv4l alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ - "-Denable_docs=true" - "-Denable_gstreamer=true" + "-Ddocs=true" + "-Dgstreamer=true" ]; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; -- cgit 1.4.1 From 5f1c33efce90e21531eea9d7a389f6d148f1c409 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 17 Sep 2018 22:12:42 -0300 Subject: efl: 1.21.0 -> 1.21.1 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index dd8162382023..bc58302cb20f 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby"; + sha256 = "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1