Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d3acb060e08c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f4596620c76
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 5, 2017

  1. Copy the full SHA
    3514af8 View commit details
  2. Copy the full SHA
    29121b6 View commit details
  3. Copy the full SHA
    3f45966 View commit details
Showing with 20 additions and 6 deletions.
  1. +20 −6 pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
26 changes: 20 additions & 6 deletions pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common, gtk_doc
, telepathy_glib, intltool, dbus_libs, icu, glib_networking
, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos
}:

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

NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";

outputs = [ "out" "man" "dev" "devdoc" ];

configureFlags = [
"--enable-media-server"
"--enable-kerberos"
"--enable-lastfm"
"--enable-todoist"
"--enable-gtk-doc"
];

enableParallelBuilding = true;

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala
docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
nativeBuildInputs = [
pkgconfig vala gnome_common intltool wrapGAppsHook
libxslt docbook_xsl_ns docbook_xsl gtk_doc
];
buildInputs = [
glib gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib glib_networking icu libsoup
gcr kerberos
];

meta = with stdenv.lib; {
platforms = platforms.linux;