diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
| commit | 6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch) | |
| tree | 8f5e976cd8aecc6029b4019e16f0177e0a66a093 /pkgs/applications/office | |
| parent | b846a53d2a3cba3002a4d6fb064f579677eac52c (diff) | |
| parent | 4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff) | |
| download | nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2 nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/cb2bib/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index aa246d241ca6..abff61b881fc 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5Full, lzo, libX11 }: +{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: stdenv.mkDerivation rec { name = pname + "-" + version; @@ -8,10 +8,13 @@ stdenv.mkDerivation rec { url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; }; - buildInputs = [ qt5Full lzo libX11 ]; - QTDIR=qt5Full; - configurePhase ='' - ./configure --prefix $out + buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; + nativeBuildInputs = [ qmakeHook ]; + + configurePhase = '' + runHook preConfigure + ./configure --prefix $out --qmakepath $QMAKE + runHook postConfigure ''; meta = with stdenv.lib; { @@ -21,4 +24,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 30fc20b6e4f6..ea265ae66614 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -129,6 +129,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index f098938ba38c..40ab4e6a2d6e 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -128,6 +128,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; |