diff options
Diffstat (limited to 'pkgs/applications')
5 files changed, 63 insertions, 2 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 8127fa23115cc..20ded9486f772 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mupdf-0.7"; src = fetchurl { - url = "http://mupdf.com/download/${name}.tar.gz"; + url = "http://mupdf.com/download/archive/${name}.tar.gz"; sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6"; }; diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix new file mode 100644 index 0000000000000..471529675dbf6 --- /dev/null +++ b/pkgs/applications/misc/nut/2.6.3.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }: + +stdenv.mkDerivation { + name = "nut-2.6.3"; + src = fetchurl { + url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz; + sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l"; + }; + + buildInputs = [ neon libusb openssl udev avahi freeipmi ]; + buildNativeInputs = [ pkgconfig ]; + + configureFlags = [ + "--with-all" + "--with-ssl" + "--without-snmp" # Until we have it ... + "--without-powerman" # Until we have it ... + "--without-cgi" + "--without-hal" + ]; + + meta = { + description = "Network UPS Tools"; + longDescription = '' + Network UPS Tools is a collection of programs which provide a common + interface for monitoring and administering UPS, PDU and SCD hardware. + It uses a layered approach to connect all of the parts. + ''; + homepage = http://www.networkupstools.org/; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ pierron ]; + priority = 10; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix new file mode 100644 index 0000000000000..27d41140be0cd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig +, intltool, libxslt }: + +stdenv.mkDerivation rec { + project = "telepathy-logger"; + name = "${project}-0.2.12"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; + sha256 = "1681m1j6vqzy089fnbfpz9i8jsg64fq6x6kf25b9p2090dnqrkj3"; + }; + + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; + + buildNativeInputs = [ libxslt ]; + + configureFlags = "--enable-call"; + + meta = { + description = "Logger service for Telepathy framework"; + homepage = http://telepathy.freedesktop.org/wiki/Logger ; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.gnu; # Arbitrary choice + }; +} diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 0febf2dcbad87..fb577be039074 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -7,7 +7,7 @@ , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash , fontsConf -, langs ? [ "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] }: let diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9fa26eba4ab0b..350b73e339f59 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -13,6 +13,8 @@ let version = "4.1.10"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; + NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7"; |