public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-user-share: 3.32.0.1 → 3.34.0

Browse Source
This commit is contained in:
Tor Hedin Brønner 2019-09-02 16:45:26 +00:00
parent 08cbcdb6e9
commit 50babe1202
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
View File

@ -1,6 +1,9 @@
{ stdenv { stdenv
, gettext , gettext
, meson
, ninja
, fetchurl , fetchurl
, fetchpatch
, apacheHttpd , apacheHttpd
, nautilus , nautilus
, pkgconfig , pkgconfig
@ -14,36 +17,55 @@
, mod_dnssd , mod_dnssd
, gnome3 , gnome3
, libcanberra-gtk3 , libcanberra-gtk3
, python3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-user-share"; pname = "gnome-user-share";
version = "3.32.0.1"; version = "3.34.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 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 = '' preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
-e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
-i data/dav_user_2.4.conf -i data/dav_user_2.4.conf
''; '';
configureFlags = [ mesonFlags = [
"--with-httpd=${apacheHttpd.out}/bin/httpd" "-Dhttpd=${apacheHttpd.out}/bin/httpd"
"--with-modules-path=${apacheHttpd.dev}/modules" "-Dmodules_path=${apacheHttpd.dev}/modules"
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user"
"--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" # 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 = [ nativeBuildInputs = [
pkgconfig pkgconfig
meson
ninja
gettext gettext
itstool itstool
libxml2 libxml2
wrapGAppsHook wrapGAppsHook
python3
]; ];
buildInputs = [ buildInputs = [