diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:24:30 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:24:30 +0000 |
| commit | 5144a19987ee5148e0a21b0d44be4a00dde24f96 (patch) | |
| tree | f81fdffda18c1b10ad1125e16fe9f77bdf80bf34 /pkgs/applications/office | |
| parent | 232da3a29db13a09e98bddab17c88958027ed0e5 (diff) | |
| parent | e9974606a50e49c4eb5df609c589234d89385992 (diff) | |
svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/kmymoney/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/office/openoffice/libreoffice.nix | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 8d1b5afe4d0bb..4bbe8400fd55e 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, - shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: +{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig +, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: stdenv.mkDerivation rec { name = "kmymoney-4.6.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ]; - buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ]; + buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ]; KDEDIRS = libalkimia; diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 5fde0cfa28503..d90beecd967a6 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -6,10 +6,13 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 , autoconf, openldap, postgresql, bash , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] +, force ? false }: -throw "The expression for libreoffice is still not ready" - +if !force then + throw ''The expression for libreoffice is still not ready. + Set config.libreoffice.force = true; if you want to try it anyway.'' +else stdenv.mkDerivation rec { name = "libreoffice-3.4.5.2"; |