diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
| commit | e51f73652d38d5c53b331b7bcae2e2483e1b8afe (patch) | |
| tree | 9126d3fd0737db3a0d57cda866d96c377fc0e452 /pkgs/desktops/gnome-2 | |
| parent | a283bec71cec60c2b9c84ea9af320fc8df0dfd5f (diff) | |
| parent | 4e0d2706f174bb893378a8241df7bd2055901b9e (diff) | |
| download | nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.gz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.bz2 nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.lz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.xz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.zst nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.zip | |
Merge recent master into staging
Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index ee08975b9daa..b278dadfe24c 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -15,11 +15,9 @@ stdenv.mkDerivation rec { # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; - meta = { + meta = with stdenv.lib; { homepage = http://projects.gnome.org/gtkglext/; - description = "GtkGLExt, an OpenGL extension to GTK+"; - longDescription = '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget API @@ -27,9 +25,7 @@ stdenv.mkDerivation rec { Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables OpenGL drawing for standard and custom GTK+ widgets. ''; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = [ ]; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } |