diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-02 16:45:26 +0000 |
---|---|---|
committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-30 19:39:44 +0200 |
commit | 50babe1202f2fbcc1e732273fa86745d9918561f (patch) | |
tree | ceac5c22c81ffb810e184bfde1e4a0b383cdf1da | |
parent | 08cbcdb6e93fed78f45a716fed565d2db71a9891 (diff) | |
download | nixpkgs-50babe1202f2fbcc1e732273fa86745d9918561f.tar nixpkgs-50babe1202f2fbcc1e732273fa86745d9918561f.tar.gz nixpkgs-50babe1202f2fbcc1e732273fa86745d9918561f.tar.bz2 nixpkgs-50babe1202f2fbcc1e732273fa86745d9918561f.tar.lz nixpkgs-50babe1202f2fbcc1e732273fa86745d9918561f.tar.xz nixpkgs-50babe1202f2fbcc1e732273fa86745d9918561f.tar.zst nixpkgs-50babe1202f2fbcc1e732273fa86745d9918561f.zip |
gnome3.gnome-user-share: 3.32.0.1 → 3.34.0
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-user-share/default.nix | 36 |
1 files changed, 29 insertions, 7 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 2a425acb067..6207dd42a61 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,6 +1,9 @@ { stdenv , gettext +, meson +, ninja , fetchurl +, fetchpatch , apacheHttpd , nautilus , pkgconfig @@ -14,36 +17,55 @@ , mod_dnssd , gnome3 , libcanberra-gtk3 +, python3 }: stdenv.mkDerivation rec { pname = "gnome-user-share"; - version = "3.32.0.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945"; + sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; }; + patches = [ + # fix gio-unix-2.0 lookup + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch; + sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; + }) + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ -i data/dav_user_2.4.conf ''; - configureFlags = [ - "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" - "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" + mesonFlags = [ + "-Dhttpd=${apacheHttpd.out}/bin/httpd" + "-Dmodules_path=${apacheHttpd.dev}/modules" + "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" + # In 3.34.0 it defaults to false but it is silently ignored and always installed. + # Let’s add it anyway in case they decide to make build respect the option in the future. + "-Dnautilus_extension=true" ]; nativeBuildInputs = [ pkgconfig + meson + ninja gettext itstool libxml2 wrapGAppsHook + python3 ]; buildInputs = [ |