alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge #54638: gnumeric: fix wrapping

Browse source
This commit is contained in:
Vladimír Čunát 2019-01-27 12:05:27 +01:00
parent eb965a4b38 85961441ee
commit 510a678f02
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/office/gnumeric/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
, itstool
}:
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-component" ];
nativeBuildInputs = [ pkgconfig intltool bison itstool makeWrapper ];
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
# ToDo: optional libgda, introspection?
buildInputs = [
@ -26,14 +26,6 @@ in stdenv.mkDerivation rec {
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 = {
updateScript = gnome3.updateScript {
packageName = pname;