From fc39a9a314ffe3470f634bd8e872c8726b2b90ed Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 26 Sep 2016 23:40:20 +0200 Subject: [PATCH 1/2] clutter: remove old version, make 1.26 default --- pkgs/desktops/gnome-3/3.20/default.nix | 3 +- pkgs/development/libraries/clutter/1.26.nix | 52 ------------------- .../development/libraries/clutter/default.nix | 10 ++-- pkgs/top-level/all-packages.nix | 10 ++-- 4 files changed, 9 insertions(+), 66 deletions(-) delete mode 100644 pkgs/development/libraries/clutter/1.26.nix diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index b19a8823fc6..cd6225ece99 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -46,13 +46,12 @@ let ]; inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2 - clutter-gst clutter_gtk; + clutter clutter-gst clutter_gtk; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; - clutter = pkgs.clutter_1_26; cogl = pkgs.cogl_1_22; gtk = gtk3; gtkmm = gtkmm3; diff --git a/pkgs/development/libraries/clutter/1.26.nix b/pkgs/development/libraries/clutter/1.26.nix deleted file mode 100644 index 07f63e1e603..00000000000 --- a/pkgs/development/libraries/clutter/1.26.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.26"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index f101e3c1880..fc80b0ec2b2 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection, gtk3 +gobjectIntrospection }: let - ver_maj = "1.16"; - ver_min = "2"; + ver_maj = "1.26"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "clutter-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc"; + sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection gtk3 + atk json_glib gobjectIntrospection ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3e0b03700e..d434b4dc169 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7223,19 +7223,15 @@ in clucene_core = clucene_core_1; - clutter = callPackage ../development/libraries/clutter { }; - - clutter_1_26 = callPackage ../development/libraries/clutter/1.26.nix { + clutter = callPackage ../development/libraries/clutter { cogl = cogl_1_22; }; clutter-gst = callPackage ../development/libraries/clutter-gst { - inherit (gnome3) cogl clutter; + inherit (gnome3) cogl; }; - clutter_gtk = callPackage ../development/libraries/clutter-gtk { - inherit (gnome3) clutter; - }; + clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; cminpack = callPackage ../development/libraries/cminpack { }; From 8976c70edaad0d66527d4193277cb00aad38e8b8 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 27 Sep 2016 00:00:03 +0200 Subject: [PATCH 2/2] cogl: remove old version, make 1.22 default --- pkgs/desktops/gnome-3/3.20/default.nix | 3 +- pkgs/development/libraries/cogl/1.22.nix | 56 --------------------- pkgs/development/libraries/cogl/default.nix | 9 ++-- pkgs/top-level/all-packages.nix | 7 +-- 4 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 pkgs/development/libraries/cogl/1.22.nix diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index cd6225ece99..ddb9dbefd6d 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -46,13 +46,12 @@ let ]; inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2 - clutter clutter-gst clutter_gtk; + clutter clutter-gst clutter_gtk cogl; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; - cogl = pkgs.cogl_1_22; gtk = gtk3; gtkmm = gtkmm3; gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; diff --git a/pkgs/development/libraries/cogl/1.22.nix b/pkgs/development/libraries/cogl/1.22.nix deleted file mode 100644 index 88bb6707749..00000000000 --- a/pkgs/development/libraries/cogl/1.22.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection -, gstreamerSupport ? true, gst_all_1 }: - -let - ver_maj = "1.22"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-introspection" - "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; - - propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage - ] - ++ libintlOrEmpty - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; - - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - - COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - #doCheck = true; # all tests fail (no idea why) - - meta = with stdenv.lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; - maintainers = with maintainers; [ lovek323 ]; - - longDescription = '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each other's toes. - ''; - - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e4570209066..88bb6707749 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -3,7 +3,7 @@ , gstreamerSupport ? true, gst_all_1 }: let - ver_maj = "1.16"; + ver_maj = "1.22"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -11,17 +11,16 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm"; + sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; }; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-introspection" - "--enable-gles1" - "--enable-gles2" "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d434b4dc169..f808afcb644 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7223,12 +7223,9 @@ in clucene_core = clucene_core_1; - clutter = callPackage ../development/libraries/clutter { - cogl = cogl_1_22; - }; + clutter = callPackage ../development/libraries/clutter { }; clutter-gst = callPackage ../development/libraries/clutter-gst { - inherit (gnome3) cogl; }; clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; @@ -7239,8 +7236,6 @@ in cogl = callPackage ../development/libraries/cogl { }; - cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { }; - coin3d = callPackage ../development/libraries/coin3d { }; CoinMP = callPackage ../development/libraries/CoinMP { };