diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-15 13:24:33 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:54 +0100 |
| commit | df37e9cf0e16577238f6ecb0db3f6048c9d888d0 (patch) | |
| tree | bec91e17c1a14a31c93f0d961adea47dd2488ae7 /pkgs | |
| parent | bf8b2afcca0979408f4ca621951c6ddf38bcfd30 (diff) | |
| download | nixpkgs-df37e9cf0e16577238f6ecb0db3f6048c9d888d0.tar nixpkgs-df37e9cf0e16577238f6ecb0db3f6048c9d888d0.tar.gz nixpkgs-df37e9cf0e16577238f6ecb0db3f6048c9d888d0.tar.bz2 nixpkgs-df37e9cf0e16577238f6ecb0db3f6048c9d888d0.tar.lz nixpkgs-df37e9cf0e16577238f6ecb0db3f6048c9d888d0.tar.xz nixpkgs-df37e9cf0e16577238f6ecb0db3f6048c9d888d0.tar.zst nixpkgs-df37e9cf0e16577238f6ecb0db3f6048c9d888d0.zip | |
gnome3.gnome-online-accounts: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index dfa0d0731dd..d3d14f555cf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,24 +1,20 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, 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, gcr, kerberos +, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc +, telepathy-glib, gettext, dbus_libs, icu, glib-networking +, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos }: -stdenv.mkDerivation rec { - name = "gnome-online-accounts-${version}"; +let + pname = "gnome-online-accounts"; version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; }; - }; - - 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 = [ @@ -32,14 +28,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig vala gnome-common intltool wrapGAppsHook - libxslt docbook_xsl_ns docbook_xsl gtk-doc + pkgconfig vala gettext wrapGAppsHook + libxslt docbook_xsl docbook_xsl_ns gtk-doc ]; buildInputs = [ glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup gcr kerberos ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; |