diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-03-07 16:35:21 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-05 11:40:34 +0200 |
commit | e6255808ca9d2417480b579476eba9f6fbf03482 (patch) | |
tree | 913944bfb6b9827d13c8a1602381ab003a38a013 /pkgs/desktops/gnome-3/core/gnome-user-share | |
parent | 25c99e15fb8ec4b1913093227051d8964e97c84f (diff) | |
download | nixpkgs-e6255808ca9d2417480b579476eba9f6fbf03482.tar nixpkgs-e6255808ca9d2417480b579476eba9f6fbf03482.tar.gz nixpkgs-e6255808ca9d2417480b579476eba9f6fbf03482.tar.bz2 nixpkgs-e6255808ca9d2417480b579476eba9f6fbf03482.tar.lz nixpkgs-e6255808ca9d2417480b579476eba9f6fbf03482.tar.xz nixpkgs-e6255808ca9d2417480b579476eba9f6fbf03482.tar.zst nixpkgs-e6255808ca9d2417480b579476eba9f6fbf03482.zip |
gnome3.gnome-user-share: 3.28.0 -> 3.32.0.1
cleanup
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-user-share')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-user-share/default.nix | 72 |
1 files changed, 45 insertions, 27 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 134ba41d653..65f9fb0db80 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,25 +1,30 @@ -{ stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme -, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: +{ stdenv +, gettext +, fetchurl +, apacheHttpd +, nautilus +, pkgconfig +, gtk3 +, glib +, libxml2 +, systemd +, wrapGAppsHook +, itstool +, libnotify +, mod_dnssd +, gnome3 +, libcanberra-gtk3 +}: stdenv.mkDerivation rec { - name = "gnome-user-share-${version}"; - version = "3.28.0"; + pname = "gnome-user-share"; + version = "3.32.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; }; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ @@ -29,22 +34,35 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" + "--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0" + ]; + + nativeBuildInputs = [ + pkgconfig + gettext + itstool + libxml2 + wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg - nautilus libnotify libcanberra-gtk3 systemd + gtk3 + glib + nautilus + libnotify + libcanberra-gtk3 + systemd ]; - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas" - ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-user-share/3.8; |