Skip to content

Commit

Permalink
Merge pull request #16747 from DamienCassou/move-gnome3.18-to-3.20
Browse files Browse the repository at this point in the history
Move some fixes from Gnome 3.18 to 3.20
  • Loading branch information
DamienCassou committed Jul 8, 2016
2 parents be18cd3 + 0b5f4b3 commit 7921e68
Show file tree
Hide file tree
Showing 31 changed files with 115 additions and 64 deletions.
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Cheese;
Expand Down
9 changes: 4 additions & 5 deletions pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf }:
, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }:

stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;

# TODO: support nautilus
# it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so

nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive
gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
gnome3.dconf ];
gnome3.dconf libnotify nautilus ];

installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ];

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/FileRoller;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

preFixup = ''
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
'';
Expand Down
1 change: 1 addition & 0 deletions pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
gnome3.geocode_glib libchamplain file libsoup
gdk_pixbuf librsvg autoreconfHook
gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
gnome3.gnome_online_accounts gnome3.defaultIconTheme ];

patches = [ ./soup.patch ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ stdenv.mkDerivation rec {

# doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
gnome3.gsettings_desktop_schemas makeWrapper gnupg
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/core/evince/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
(if supportXPS then "--enable-xps" else "--disable-xps")
];

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

preConfigure = with stdenv.lib;
optionalString doCheck ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;

# this should probably be setuphook for glib
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

enableParallelBuilding = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

Expand Down
1 change: 0 additions & 1 deletion pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];

configureFlags = [
"--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" # NixOS hardcoded path
"--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=$$out/lib/pkcs11/"
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;

# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

buildInputs = with gnome3;
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
Expand Down
11 changes: 8 additions & 3 deletions pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
, sqlite, libgweather, libcanberra_gtk3
, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
Expand All @@ -15,16 +15,18 @@ stdenv.mkDerivation rec {

buildInputs = with gnome3;
[ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
libcroco intltool libsecret pkgconfig libsoup polkit libcanberra gdk_pixbuf librsvg
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
libical libtool nss gtk gstreamer makeWrapper gdm
libcanberra_gtk3 gnome_control_center
defaultIconTheme sqlite gnome3.gnome-bluetooth
libgweather # not declared at build time, but typelib is needed at runtime
gnome3.gnome-clocks # schemas needed
at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];

propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ];

installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];

preBuild = ''
Expand All @@ -40,6 +42,9 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
--suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/bin/gnome-shell-extension-tool" \
--prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH"
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf
Expand All @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/gsettings-schemas/$name
mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
'';

preFixup = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

stdenv.mkDerivation rec {
major = "0.3";
minor = "1";
minor = "2";
name = "grilo-plugins-${major}.${minor}";

src = fetchurl {
url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";
sha256 = "1akd7q6pqnkcnayrdfjb0qx5w5yyl06kxzwhqp2gxm4y1b208pb0";
sha256 = "1z8s62a29zidm35ajf708r7d36glb27im4s52l02q9w1jwl8j6vr";
};

installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
Expand Down
12 changes: 7 additions & 5 deletions pkgs/desktops/gnome-3/3.20/core/grilo/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, file, intltool, glib
, libxml2, gnome3, gobjectIntrospection, libsoup }:
, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }:

stdenv.mkDerivation rec {
major = "0.3";
minor = "0";
major = "0.3"; # if you change this, also change ./setup-hook.sh
minor = "1";
name = "grilo-${major}.${minor}";

src = fetchurl {
url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
sha256 = "0q5wcvnckpfks48hy0gvlfdmvqm67vnblm3912rssmkgc1ysil8z";
sha256 = "0k6d8drgh7inbpxqfa9m9dm4vrhfb9ifi5b88fn8q2ljqwfwdggb";
};

setupHook = ./setup-hook.sh;
Expand All @@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
'';

buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
gnome3.totem-pl-parser gobjectIntrospection ];
gnome3.totem-pl-parser ];

propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
make_grilo_find_plugins() {
if [ -d "$1"/lib/grilo-0.2 ]; then
addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2"
if [ -d "$1"/lib/grilo-0.3 ]; then
addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3"
fi
}

Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libxml2, glib }:

stdenv.mkDerivation rec {
name = "libcroco-0.6.8";
name = "libcroco-0.6.11";

src = fetchurl {
url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk";
};

outputs = [ "dev" "out" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1xniw4y90hbk9fa548pa9pfclibw7amr2f458lfh16jdzq7gw5cz";
};

NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";

buildInputs = with gnome3;
[ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
Expand Down
9 changes: 4 additions & 5 deletions pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3
, glib, gtk3, gobjectIntrospection, python, pygobject3
, glib, gtk3, gobjectIntrospection, python3Packages, ncurses
}:

stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;

buildInputs = [
intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3
gnome3.defaultIconTheme
];
configureFlags = [ "--enable-python3" ];

buildInputs = [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];

meta = with stdenv.lib; {
description = "A GObject-based plugins engine";
Expand Down
11 changes: 7 additions & 4 deletions pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Autogenerated by maintainers/scripts/gnome.sh update

fetchurl: {
name = "libpeas-1.16.0";
fetchurl: rec {
major = "1.18";
minor = "0";
version = "${major}.${minor}";
name = "libpeas-${version}";

src = fetchurl {
url = mirror://gnome/sources/libpeas/1.16/libpeas-1.16.0.tar.xz;
sha256 = "b093008ecd65f7d55c80517589509698ff15ad41f664b11a3eb88ff461b1454e";
url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";
sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";
};
}
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;

# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra";

Expand Down
Loading

0 comments on commit 7921e68

Please sign in to comment.