Merge #54638: gnumeric: fix wrapping
This commit is contained in:
commit
510a678f02
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
|
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
|
||||||
, goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages
|
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
|
||||||
, itstool
|
, itstool
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = [ "--disable-component" ];
|
configureFlags = [ "--disable-component" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool bison itstool makeWrapper ];
|
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
|
||||||
|
|
||||||
# ToDo: optional libgda, introspection?
|
# ToDo: optional libgda, introspection?
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -26,14 +26,6 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
for f in "$out"/bin/gnumeric-*; do
|
|
||||||
wrapProgram $f \
|
|
||||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
|
|
||||||
${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules'"}
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gnome3.updateScript {
|
updateScript = gnome3.updateScript {
|
||||||
packageName = pname;
|
packageName = pname;
|
||||||
|
|
Loading…
Reference in a new issue