gnome-user-share: fix cross compilation
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildPackages,
|
||||
gettext,
|
||||
meson,
|
||||
ninja,
|
||||
@@ -28,11 +29,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-H6wbuIAN+kitnD4ZaQ9+EOZ6T5lNnLF8rh0b3/yRRLo=";
|
||||
};
|
||||
|
||||
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
|
||||
'';
|
||||
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
|
||||
''
|
||||
+ lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
substituteInPlace meson.build --replace-fail \
|
||||
"run_command([httpd, '-v']" \
|
||||
"run_command(['${stdenv.hostPlatform.emulator buildPackages}', httpd, '-v']"
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Dhttpd=${apacheHttpd.out}/bin/httpd"
|
||||
@@ -45,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
glib # for glib-compile-schemas
|
||||
itstool
|
||||
libxml2
|
||||
wrapGAppsNoGuiHook
|
||||
@@ -56,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
|
||||
Reference in New Issue
Block a user