diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:09:26 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:09:26 +0100 |
commit | 73b88e17dda6eb6546e0fdcefeb3251f806d88d3 (patch) | |
tree | 4ec0603851ec82737ccbc387fe1db1bb63a572fa /pkgs/applications/office | |
parent | 539e94030c226562433e5ff96299dffb0641427a (diff) | |
parent | cf27abf534930ecb1657c4a4e7466ed15c4a2076 (diff) | |
download | nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.gz nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.bz2 nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.lz nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.xz nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.zst nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/flexibee/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 4 |
3 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index 71c69603631..831d8cbcf2a 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: let - version = "2019.3.0.3"; + version = "2019.3.0.7"; majorVersion = builtins.substring 0 6 version; in @@ -11,16 +11,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1ivhqh1rl4ll0af9nfgfm7f647vc9zk61aplinvz73xb3grb4j6f"; + sha256 = "01n2pkh17s2iab7n9xgq9vqcf1fnzmb382zmmd1lwyw3x57f5rq2"; }; nativeBuildInputs = [ makeWrapper ]; + prePatch = '' + substituteInPlace usr/sbin/flexibee-server \ + --replace "/usr/share/flexibee" $out \ + --replace "/var/run" "/run" + ''; + + installPhase = '' runHook preInstall cp -R usr/share/flexibee/ $out/ install -Dm755 usr/bin/flexibee $out/bin/flexibee - wrapProgram $out/bin/flexibee --set JAVA_HOME "${jre}" + install -Dm755 usr/sbin/flexibee-server $out/bin/flexibee-server + wrapProgram $out/bin/flexibee --set JAVA_HOME "${jre}" + wrapProgram $out/bin/flexibee-server --set JAVA_HOME "${jre}" runHook postInstall ''; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a459302177b..2f220fa2fb6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd -, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon +, libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux @@ -363,7 +363,7 @@ in stdenv.mkDerivation rec { libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler - python3 sablotron sane-backends unzip vigra which zip zlib + python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 4739d526558..be87a8bb672 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd -, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon +, libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux @@ -360,7 +360,7 @@ in stdenv.mkDerivation rec { libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl poppler - python3 sablotron sane-backends unzip vigra which zip zlib + python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy |