colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdl: rename from gnome3.gdl

Browse Source
This commit is contained in:
Jan Tojnar 2019-01-19 07:28:06 +01:00
parent dd3626c036
commit 437e478a50
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
libvorbis, gdk_pixbuf }: libvorbis, gdk_pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl gettext curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta gdl gnome3.defaultIconTheme gnome3.anjuta
] ++ (with perlPackages; [ perl XMLParser ]); ] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = '' patchPhase = ''

4
pkgs/applications/misc/gpx-viewer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }: { stdenv, fetchurl, intltool, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpx-viewer-${version}"; name = "gpx-viewer-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
desktop-file-utils # For update-desktop-database desktop-file-utils # For update-desktop-database
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
]; ];
buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://blog.sarine.nl/tag/gpxviewer/; homepage = https://blog.sarine.nl/tag/gpxviewer/;

4
pkgs/desktops/gnome-3/default.nix
View File

@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -288,8 +288,6 @@ lib.makeScope pkgs.newScope (self: with self; {
devhelp = callPackage ./devtools/devhelp { }; devhelp = callPackage ./devtools/devhelp { };
gdl = callPackage ./devtools/gdl { };
gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
nemiver = callPackage ./devtools/nemiver { }; nemiver = callPackage ./devtools/nemiver { };

5
pkgs/desktops/gnome-3/devtools/anjuta/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
gdl, libgda, gtksourceview,
itstool, python3, ncurses, makeWrapper }: itstool, python3, ncurses, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,8 +23,8 @@ stdenv.mkDerivation rec {
ncurses ncurses
]; ];
buildInputs = [ buildInputs = [
flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl flex bison gtk3 libxml2 gnome3.gjs gdl
gnome3.libgda gnome3.gtksourceview libgda gtksourceview
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
]; ];

16
pkgs/desktops/gnome-3/devtools/gdl/default.nix → pkgs/development/libraries/gdl/default.nix
View File

@ -1,20 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: { stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gdl-${version}"; pname = "gdl";
version = "3.28.0"; version = "3.28.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j";
}; };
passthru = { nativeBuildInputs = [ pkgconfig intltool ];
updateScript = gnome3.updateScript { packageName = "gdl"; attrPath = "gnome3.gdl"; }; buildInputs = [ libxml2 gtk3 ];
};
nativeBuildInputs = [ pkgconfig ]; passthru = {
buildInputs = [ libxml2 gtk3 intltool ]; updateScript = gnome3.updateScript {
packageName = "gdl";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Gnome docking library"; description = "Gnome docking library";

2
pkgs/top-level/all-packages.nix
View File

@ -9880,6 +9880,8 @@ in
gcr = callPackage ../development/libraries/gcr { }; gcr = callPackage ../development/libraries/gcr { };
gdl = callPackage ../development/libraries/gdl { };
gdome2 = callPackage ../development/libraries/gdome2 { gdome2 = callPackage ../development/libraries/gdome2 {
inherit (gnome2) gtkdoc; inherit (gnome2) gtkdoc;
}; };