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

Merge pull request #104074 from jtojnar/more-gnome-updates

Browse Source
This commit is contained in:
Jan Tojnar 2020-11-18 13:05:22 +01:00 committed by GitHub
commit 9635686059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 154 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/backup/deja-dup/default.nix
View File

@ -21,14 +21,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "deja-dup"; pname = "deja-dup";
version = "42.4"; version = "42.5";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "World"; owner = "World";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY="; sha256 = "1xgsd9a9y36lv6f2vjw2nxi9zj2zl1gv6rcyzkqajf91vgmxwf8k";
}; };
patches = [ patches = [

21
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch , pkg-config
, pkgconfig
, dconf , dconf
, telepathy-glib , telepathy-glib
, python3 , python3
@ -11,31 +10,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-mission-control"; pname = "telepathy-mission-control";
version = "5.16.5"; version = "5.16.6";
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
src = fetchurl { src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d";
}; };
patches = [
# Fix property name (new GLib is stricter)
# https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939
# https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141
(fetchpatch {
url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch";
sha256 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb";
})
];
buildInputs = [ buildInputs = [
python3 python3
]; # ToDo: optional stuff missing ]; # ToDo: optional stuff missing
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkg-config
libxslt libxslt
makeWrapper makeWrapper
]; ];
@ -57,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An account manager and channel dispatcher for the Telepathy framework"; description = "An account manager and channel dispatcher for the Telepathy framework";
homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/";
license = licenses.lgpl21; license = licenses.lgpl21Only;
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

4
pkgs/data/documentation/gnome-user-docs/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-user-docs"; pname = "gnome-user-docs";
version = "3.38.0"; version = "3.38.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12pfvivsgz4qvx3y6zndxln28fgvbdv2kjy6l892i4f5bmdxplrq"; sha256 = "0j4yfv6b31dwv3aky20bnap6gql1xpl3fz3qzjx1lmr3bngz92jf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

7
pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
View File

@ -20,11 +20,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-connections"; pname = "gnome-connections";
version = "3.38.0"; version = "3.38.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz"; url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz";
hash = "sha256-Eob36/zoWIGdYMpWks280FoIHGL7AHUhinFA4cEqels="; hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = "connections";
attrPath = "gnome-connections";
}; };
}; };

10
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@ -22,16 +22,16 @@
, p11-kit , p11-kit
, openssh , openssh
, gsettings-desktop-schemas , gsettings-desktop-schemas
, libhandy_0 , libhandy
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "seahorse"; pname = "seahorse";
version = "3.37.2"; version = "3.38.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-flpBYSYDDDTONYZuRR3V2sx637Mp1dMQJ79fUGLtRio="; hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI=";
}; };
doCheck = true; doCheck = true;
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
openssh openssh
openldap openldap
libpwquality libpwquality
libhandy_0 # not yet ported to libhandy-1 libhandy
]; ];
postPatch = '' postPatch = ''
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Seahorse"; homepage = "https://wiki.gnome.org/Apps/Seahorse";
description = "Application for managing encryption keys and passwords in the GnomeKeyring"; description = "Application for managing encryption keys and passwords in the GnomeKeyring";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

82
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View File

@ -1,35 +1,73 @@
{ stdenv, gettext, fetchurl, evolution-data-server, fetchpatch { stdenv
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , gettext
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , fetchurl
, wrapGAppsHook, folks, libxml2, gnome3 , evolution-data-server
, vala, meson, ninja, libhandy, gsettings-desktop-schemas , fetchpatch
, pkgconfig
, libxslt
, docbook_xsl
, docbook_xml_dtd_42
, python3
, gtk3
, glib
, cheese
, libchamplain
, clutter-gtk
, geocode-glib
, gnome-desktop
, gnome-online-accounts
, wrapGAppsHook
, folks
, libxml2
, gnome3
, vala
, meson
, ninja
, libhandy
, gsettings-desktop-schemas
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-contacts"; pname = "gnome-contacts";
version = "3.38"; version = "3.38.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "f8LuaJwfOcLmN163YLlOFlHOSoKK1AggbToD4TPaGa8="; sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9";
}; };
propagatedUserEnvPkgs = [ evolution-data-server ]; propagatedUserEnvPkgs = [
evolution-data-server
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 python3 wrapGAppsHook meson
ninja
pkgconfig
vala
gettext
libxslt
docbook_xsl
docbook_xml_dtd_42
python3
wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gtk3 glib evolution-data-server gsettings-desktop-schemas gtk3
folks gnome-desktop libhandy glib
libxml2 gnome-online-accounts cheese evolution-data-server
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib gsettings-desktop-schemas
]; folks
gnome-desktop
mesonFlags = [ libhandy
# Upstream does not seem to maintain this properly: https://gitlab.gnome.org/GNOME/gnome-contacts/issues/103 libxml2
"-Dtelepathy=false" gnome-online-accounts
cheese
gnome3.adwaita-icon-theme
libchamplain
clutter-gtk
geocode-glib
]; ];
postPatch = '' postPatch = ''
@ -37,12 +75,6 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py
''; '';
# In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0:
# /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory
# #include <clutter-gtk/clutter-gtk.h>
# ^~~~~~~~~~~~~~~~~~~~~~~~~~~
NIX_CFLAGS_COMPILE = "-I${stdenv.lib.getDev clutter-gtk}/include/clutter-gtk-1.0";
doCheck = true; doCheck = true;
passthru = { passthru = {
@ -56,7 +88,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Contacts"; homepage = "https://wiki.gnome.org/Apps/Contacts";
description = "GNOME’s integrated address book"; description = "GNOME’s integrated address book";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

4
pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser"; pname = "gnome-shell-extension-sound-output-device-chooser";
version = "28"; version = "32";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kgshank"; owner = "kgshank";
repo = "gse-sound-output-device-chooser"; repo = "gse-sound-output-device-chooser";
rev = version; rev = version;
sha256 = "1vmf8mgb52x7my3sidaw8kh26d5niadn18bgrl6bjcakmj5x8q16"; sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l";
}; };
patches = [ patches = [

20
pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
View File

@ -1,14 +1,18 @@
diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-output-device-chooser@kgshank.net/convenience.js
index 54ad06f..0860531 100644
--- a/sound-output-device-chooser@kgshank.net/convenience.js --- a/sound-output-device-chooser@kgshank.net/convenience.js
+++ b/sound-output-device-chooser@kgshank.net/convenience.js +++ b/sound-output-device-chooser@kgshank.net/convenience.js
@@ -111,7 +111,7 @@ function refreshCards() { @@ -129,7 +129,7 @@ function refreshCards() {
log("New logic"); if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) {
_log("New logic");
let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path(); let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
try { - let pythonExec = 'python';
- let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation); + let pythonExec = '@python@';
+ let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation); let pyVer = 3;
// log("result" + result +" out"+out + " exit_code" + exit_code + " while(!isCmdFound(pythonExec) && pyVer >=2){
// err" +err); _log(pythonExec + " is not found. Try next");
if(result && !exit_code) { diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
index c4d2484..262608d 100644
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py --- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py +++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
@@ -86,7 +86,7 @@ else: @@ -86,7 +86,7 @@ else:

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

@ -19,14 +19,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aisleriot"; pname = "aisleriot";
version = "3.22.11"; version = "3.22.13";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1"; sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

8
pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-mahjongg"; pname = "gnome-mahjongg";
version = "3.38.2"; version = "3.38.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1wslwhr782pdzrvca7wa6smvyid5yr42kjlra6qd9ji5qss0i1wj"; sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -24,10 +24,6 @@ stdenv.mkDerivation rec {
librsvg librsvg
]; ];
mesonFlags = [
"-Dcompile-schemas=enabled"
];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-nibbles"; pname = "gnome-nibbles";
version = "3.38.1"; version = "3.38.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "096mk2hsa1za002rk4cnhm0h8ps99jzl47kap27i16s4m2ny71vk"; sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

14
pkgs/development/libraries/gnome-online-accounts/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv { stdenv
, fetchFromGitLab , fetchFromGitLab
, pkgconfig , pkg-config
, vala , vala
, glib , glib
, meson , meson
@ -18,7 +18,7 @@
, icu , icu
, glib-networking , glib-networking
, libsoup , libsoup
, docbook_xsl , docbook-xsl-nons
, docbook_xml_dtd_412 , docbook_xml_dtd_412
, gnome3 , gnome3
, gcr , gcr
@ -30,7 +30,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-online-accounts"; pname = "gnome-online-accounts";
version = "3.37.90"; version = "3.38.0";
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
src = fetchFromGitLab { src = fetchFromGitLab {
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "GNOME"; owner = "GNOME";
repo = "gnome-online-accounts"; repo = "gnome-online-accounts";
rev = version; rev = version;
sha256 = "05ahib6bjbfyj2gbqjijzg9i7x1q0r67hyph0fbrgnnadlpk2cv8"; sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag=";
}; };
outputs = [ "out" "man" "dev" "devdoc" ]; outputs = [ "out" "man" "dev" "devdoc" ];
@ -52,16 +52,16 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
dbus # used for checks and pkgconfig to install dbus service/s dbus # used for checks and pkg-config to install dbus service/s
docbook_xml_dtd_412 docbook_xml_dtd_412
docbook_xsl docbook-xsl-nons
gettext gettext
gobject-introspection gobject-introspection
gtk-doc gtk-doc
libxslt libxslt
meson meson
ninja ninja
pkgconfig pkg-config
python3 python3
vala vala
wrapGAppsHook wrapGAppsHook

43
pkgs/development/libraries/gspell/default.nix
View File

@ -1,27 +1,50 @@
{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobject-introspection, gnome3 }: { stdenv
, fetchurl
, pkgconfig
, libxml2
, glib
, gtk3
, enchant2
, icu
, vala
, gobject-introspection
, gnome3
}:
let stdenv.mkDerivation rec {
pname = "gspell"; pname = "gspell";
version = "1.8.4"; version = "1.9.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1d23pl9956dkpy52pbndp0vrba0y030msh1issdl84z82skickfg"; sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw";
}; };
propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig nativeBuildInputs = [
pkgconfig
vala
gobject-introspection
libxml2
];
nativeBuildInputs = [ pkgconfig vala gobject-introspection libxml2 ]; buildInputs = [
buildInputs = [ glib gtk3 isocodes ]; glib
gtk3
icu
];
propagatedBuildInputs = [
# required for pkgconfig
enchant2
];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
versionPolicy = "none";
}; };
}; };

23
pkgs/development/libraries/libhandy/0.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome3, glade , gtk3, gnome3
, dbus, xvfb_run, libxml2 , dbus, xvfb_run, libxml2
, hicolor-icon-theme , hicolor-icon-theme
}: }:
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
pname = "libhandy"; pname = "libhandy";
version = "0.0.13"; version = "0.0.13";
outputs = [ "out" "dev" "devdoc" "glade" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
src = fetchFromGitLab { src = fetchFromGitLab {
@ -20,32 +20,19 @@ stdenv.mkDerivation rec {
sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
}; };
patches = [
# Fix build with Glade 3.36.0
# https://source.puri.sm/Librem5/libhandy/merge_requests/451
(fetchpatch {
url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
excludes = [ "glade/glade-hdy-header-bar.c" ];
})
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gobject-introspection vala libxml2 meson ninja pkgconfig gobject-introspection vala libxml2
gtk-doc docbook_xsl docbook_xml_dtd_43 gtk-doc docbook_xsl docbook_xml_dtd_43
]; ];
buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ];
checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=true" "-Dgtk_doc=true"
"-Dglade_catalog=enabled" "-Dglade_catalog=disabled"
"-Dintrospection=enabled" "-Dintrospection=enabled"
]; ];
PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
doCheck = true; doCheck = true;
checkPhase = '' checkPhase = ''

4
pkgs/development/libraries/libhandy/default.nix
View File

@ -23,14 +23,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libhandy"; pname = "libhandy";
version = "1.0.1"; version = "1.0.2";
outputs = [ "out" "dev" "devdoc" "glade" ]; outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "106qa4d2rcbvd3g3avbgkd59aq0bjvwpx8vfz1cikvwrarnfvql4"; sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

16
pkgs/development/tools/glade/default.nix
View File

@ -2,14 +2,19 @@
, gettext , gettext
, fetchurl , fetchurl
, python3 , python3
, meson
, ninja
, pkg-config , pkg-config
, gtk3 , gtk3
, glib , glib
, gjs
, webkitgtk
, gobject-introspection , gobject-introspection
, wrapGAppsHook , wrapGAppsHook
, itstool , itstool
, libxml2 , libxml2
, docbook-xsl-nons , docbook-xsl-nons
, docbook_xml_dtd_42
, gnome3 , gnome3
, gdk-pixbuf , gdk-pixbuf
, libxslt , libxslt
@ -18,19 +23,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "glade"; pname = "glade";
version = "3.36.0"; version = "3.38.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r"; sha256 = "1kfgs2dpjd8dnnjkfc4xdy8yjjavlzimqzyfr1pq1m1h96z506hp";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson
ninja
pkg-config pkg-config
gettext gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_42
libxslt libxslt
libxml2 libxml2
gobject-introspection gobject-introspection
@ -39,6 +47,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
glib glib
gjs
webkitgtk
libxml2 libxml2
python3 python3
python3.pkgs.pygobject3 python3.pkgs.pygobject3
@ -47,8 +57,6 @@ stdenv.mkDerivation rec {
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];
enableParallelBuilding = true;
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;