diff options
Diffstat (limited to 'pkgs/applications')
28 files changed, 543 insertions, 226 deletions
diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 84a98182e9f..a1a9aa4fa32 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -8,19 +8,19 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-23.3"; + name = "emacs-23.3b"; builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.bz2"; - sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a"; + sha256 = "1vp6qbbjgh5zpd87j3ggsvgf8q6cax8z3cdx3syv5v2662dapp46"; }; - buildInputs = + buildInputs = [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft gconf - ] + ] ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux dbus; diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh new file mode 100644 index 00000000000..d04e7a4fdd3 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/builder.sh @@ -0,0 +1,34 @@ +source $stdenv/setup + +# This hook is supposed to be run on Linux. It patches the proper locations of +# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with +# *our* versions, not the ones found in the system, as it would do by default. +# On other platforms, this appears to be unnecessary. +preConfigure() { + case "${system}" in + x86_64-linux) glibclibdir=lib64 ;; + i686-linux) glibclibdir=lib ;; + *) return; + esac + + libc=$(cat ${NIX_GCC}/nix-support/orig-libc) + echo "libc: $libc" + + for i in src/s/*.h src/m/*.h; do + substituteInPlace $i \ + --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ + --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ + --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \ + --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \ + --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ + --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o + done + + for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do + substituteInPlace $i --replace /bin/pwd pwd + done +} + +preBuild="make bootstrap" + +genericBuild diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix new file mode 100644 index 00000000000..91307deb220 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -0,0 +1,78 @@ +{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d +, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif +, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls +, alsaLib +}: + +# XXX: ? +# - checking for alsa >= 1.0.0... no +# - checking for Wand >= 6.2.8... no +# - imagemagickBig instead of imagemagick? + +assert (gtk != null) -> (pkgconfig != null); +assert (libXft != null) -> libpng != null; # probably a bug +assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise + +stdenv.mkDerivation rec { + name = "emacs-24.0.92"; + + builder = ./builder.sh; + + src = fetchurl { + url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz"; + sha256 = "0pwps72zj7mm6asly1vdq46dcj3in4qrkb6ss9xq6nbf039nj4w6"; + }; + + buildInputs = + [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif + libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib + ] + ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] + ++ stdenv.lib.optional stdenv.isLinux dbus; + + configureFlags = + stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"] + + # On NixOS, help Emacs find `crt*.o'. + ++ stdenv.lib.optional (stdenv ? glibc) + [ "--with-crt-dir=${stdenv.glibc}/lib" ]; + + postInstall = '' + cat >$out/share/emacs/site-lisp/site-start.el <<EOF +;; nixos specific load-path +(when (getenv "NIX_PROFILES") (setq load-path + (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) + (split-string (getenv "NIX_PROFILES")))) + load-path))) +EOF + ''; + + doCheck = true; + + meta = { + description = "PRETEST: GNU Emacs 24.x, the extensible, customizable text editor"; + + longDescription = '' + GNU Emacs is an extensible, customizable text editor—and more. At its + core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + + The features of GNU Emacs include: content-sensitive editing modes, + including syntax coloring, for a wide variety of file types including + plain text, source code, and HTML; complete built-in documentation, + including a tutorial for new users; full Unicode support for nearly all + human languages and their scripts; highly customizable, using Emacs + Lisp code or a graphical interface; a large number of extensions that + add other functionality, including a project planner, mail and news + reader, debugger interface, calendar, and more. Many of these + extensions are distributed with GNU Emacs; others are available + separately. + ''; + + homepage = http://www.gnu.org/software/emacs/; + license = "GPLv3+"; + + maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix index e749dfa4486..948beae82d4 100644 --- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el; - sha256 = "17sbhf4r6jh4610x8qb2y0y3hww7w33vfsjqg4vrz99pr29xffry"; + url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi; + sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160"; }; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 07ea125afd8..fb4de650ee0 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, emacs, texinfo, which }: stdenv.mkDerivation rec { - name = "org-7.8"; + name = "org-7.8.03"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "0idxsxdr5p0bvnjmhvpdkfwhlpkxmihnaljf43k0311g9z3k22qz"; + sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958"; }; buildInputs = [ emacs texinfo ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = with stdenv.lib.maintainers; [ ludo chaoflow ]; + platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/editors/emacs-snapshot/builder.sh b/pkgs/applications/editors/emacs-snapshot/builder.sh deleted file mode 100644 index 677311c4fd3..00000000000 --- a/pkgs/applications/editors/emacs-snapshot/builder.sh +++ /dev/null @@ -1,21 +0,0 @@ -source $stdenv/setup - -preConfigure() { - libc=$(cat ${NIX_GCC}/nix-support/orig-libc) - echo "libc: $libc" - - for i in src/s/*.h src/m/*.h; do - substituteInPlace $i \ - --replace /usr/lib/crt1.o $libc/lib/crt1.o \ - --replace /usr/lib/crti.o $libc/lib/crti.o \ - --replace /usr/lib/crtn.o $libc/lib/crtn.o - done - - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done -} - -preBuild="make bootstrap" - -genericBuild diff --git a/pkgs/applications/editors/emacs-snapshot/default.nix b/pkgs/applications/editors/emacs-snapshot/default.nix deleted file mode 100644 index 1ae864336e5..00000000000 --- a/pkgs/applications/editors/emacs-snapshot/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ xawSupport ? true -, xpmSupport ? true -, dbusSupport ? true -, xaw3dSupport ? false -, gtkGUI ? false -, xftSupport ? false -, stdenv, fetchcvs, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null -, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null -, libpng, libjpeg, libungif, libtiff, texinfo -, autoconf, automake -}: - -assert xawSupport -> libXaw != null; -assert xpmSupport -> libXpm != null; -assert dbusSupport -> dbus != null; -assert xaw3dSupport -> Xaw3d != null; -assert gtkGUI -> pkgconfig != null && gtk != null; -assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug - -let date = "2009-06-26"; in -stdenv.mkDerivation { - name = "emacs-snapshot-23-${date}"; - - builder = ./builder.sh; - - src = fetchcvs { - inherit date; - cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs"; - module = "emacs"; - sha256 = "bf9b21a0634f45474a1ce91e6153ced69194f1e9c0acd6626a931198f4a5972f"; - }; - - preConfigure = "autoreconf -vfi"; - - buildInputs = [ - autoconf automake - ncurses x11 texinfo - (if xawSupport then libXaw else null) - (if xpmSupport then libXpm else null) - (if dbusSupport then dbus else null) - (if xaw3dSupport then Xaw3d else null) - libpng libjpeg libungif libtiff # maybe not strictly required? - ] - ++ (if gtkGUI then [pkgconfig gtk] else []) - ++ (if xftSupport then [libXft] else []); - - configureFlags = " - ${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""} - "; - - postInstall = '' - cat >$out/share/emacs/site-lisp/site-start.el <<EOF -;; nixos specific load-path -(when (getenv "NIX_PROFILES") (setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (getenv "NIX_PROFILES")))) - load-path))) -EOF - ''; - - meta = { - description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)"; - homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs; - license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; # GTK & co. are needed. - }; -} diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix new file mode 100644 index 00000000000..c1579579d81 --- /dev/null +++ b/pkgs/applications/graphics/k3d/default.nix @@ -0,0 +1,42 @@ +{stdenv, fetchurl, gtkLibs, gnome + , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype + , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff + , gettext, intltool, perl + }: + +stdenv.mkDerivation rec { + version = "0.8.0.2"; + name = "k3d-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/k3d/K-3D%20Source/K-3D%200.8.0.2/k3d-source-0.8.0.2.tar.bz2"; + sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; + }; + + patches = [ (fetchurl { + url = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15/k3d_gtkmm224.patch"; + sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5"; + }) + ]; + + preConfigure = '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" + ''; + + buildInputs = with gtkLibs; with gnome; [ + cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng + boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext + intltool perl + gtkmm glibmm gtkglext + ]; + + doCheck = false; + + meta = { + description = "A 3D editor with support for procedural editing"; + homepage = "http://k-3d.org/"; + platforms = with stdenv.lib.platforms; + linux; + maintainers = with stdenv.lib.maintainers; + [raskin]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 66c0f039403..3fffc68b6b2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { - name = "chromium-17.0.943.0-pre${version}"; + name = "chromium-18.0.975.0-pre${version}"; # To determine the latest revision, get # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’. - # For the version number, see ‘about:config’. - version = "110566"; + # For the version number, see ‘about:version’. + version = "114925"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip"; - sha256 = "0pi2qbcvqy9gn2s0bfqlam3mj5ghnnnkrbxrrjl63737377an7ha"; + sha256 = "19ayrcz1vw7nqr3bbas5f414n3kibf7knd285azrk29f7a7dnpd6"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip"; - sha256 = "0mk8ikgz97i69qy1cy3cqw4a2ff2ixjzyw5i86fmrq7m1f156yva"; + sha256 = "1bhcd3plw3r62bfysc9nszn07xv3gamf5lkwd6ardwyxanclc7x6"; } else throw "Chromium is not supported on this platform."; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chromium, an open source web browser"; homepage = http://www.chromium.org/; - maintainers = [ maintainers.goibhniu ]; + maintainers = with stdenv.lib.maintainers; [ goibhniu chaoflow ]; license = licenses.bsd3; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 08196780143..6bca02820b4 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20110917"; + name = "conkeror-1.0pre-20120105"; src = fetchurl { - url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip; - sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2"; + url = http://repo.or.cz/w/conkeror.git/snapshot/da0f9962eeedca9133e8b1928108594173f1769c.zip; + sha256 = "75176e5bb077a5ad05b82df01939edeb240e2caba9657a6e175fb3aabf23b393"; }; buildInputs = [ unzip makeWrapper ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; homepage = http://conkeror.org/; license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 76b5dde0e87..7dc66886af6 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11, - alsaLib, aspell, libidn, qca2, phonon }: + alsaLib, aspell, libidn, qca2, phonon, pkgconfig }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g"; }; - buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon + buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig ]; configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 7d04d9e9fec..66dbddece3c 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, - libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all }: + libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }: stdenv.mkDerivation rec { name = "psi-0.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig]; + qca2 qca2_ossl pkgconfig which glib]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; psiMedia = (import ./psimedia.nix) { - inherit stdenv fetchurl qt4 speex gst_all liboil; + inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig; }; postInstall = '' diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index 4574b5a9b35..c7cee2f2c66 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, gst_all, liboil, speex}: +{stdenv, fetchurl, qt4, gst_all, liboil, speex, which, glib, pkgconfig}: stdenv.mkDerivation rec { name = "psimedia"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781"; }; - buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex]; + buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex which glib pkgconfig]; configurePhase = ''./configure''; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9cf5909575b..dc4c0531031 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,41 +1,51 @@ -{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }: +{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg1, + pkgconfig, talloc, xapian +}: stdenv.mkDerivation rec { - name = "notmuch-0.9"; + name = "notmuch-0.11"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4"; + sha256 = "ce062b31db6868babaf3088adee95bfd1030b2691493e815da1730dd262226c0"; }; - buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ]; + buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; patchPhase = '' (cd test && for prg in \ aggregate-results.sh \ + argument-parsing \ atomicity \ author-order \ basic \ crypto \ + count \ dump-restore \ emacs \ emacs-large-search-buffer \ encoding \ from-guessing \ + help-test \ + hooks \ json \ long-id \ maildir-sync \ + multipart \ new \ notmuch-test \ + python \ raw \ reply \ search \ search-by-folder \ search-insufficient-from-quoting \ search-folder-coherence \ + search-limiting \ search-output \ search-position-overlap-bug \ symbol-hiding \ + tagging \ test-lib.sh \ test-verbose \ thread-naming \ @@ -47,15 +57,16 @@ stdenv.mkDerivation rec { done) ''; - postBuild = '' - make test - ''; + # XXX: emacs tests broken + #postBuild = '' + # make test + #''; meta = { description = "Notmuch -- The mail indexer"; longDescription = ""; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix new file mode 100644 index 00000000000..4d68191c6f2 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, gcc, cmake, qt4, gettext +, kdelibs, kdebase_workspace, perl +, openssl, phonon, automoc4 +, libX11, libXext, libXft +, unrar, p7zip, par2cmdline, coreutils +}: + +let version = "0.8.0"; + name = "kwooty-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/kwooty/${name}.tar.gz"; + sha256 = "bb50fb9b3d6c973f2abee62cfc11a7086900a4b676c12bf4e0a2adc170a977fc"; + }; + + patches = [ ./searchPath.patch ]; + + postPatch = '' + echo "Changing paths to archive utilities to the nix store"; + substituteInPlace "src/utility.cpp" \ + --replace "/usr/bin/unrar" "${unrar}/bin" \ + --replace "/usr/bin/unpar" "${par2cmdline}/bin" \ + --replace "/usr/bin/7z" "${p7zip}/bin" \ + --replace "/usr/bin/nice" "${coreutils}/bin/nice" + ''; + + buildInputs = + [ gcc perl cmake qt4 gettext automoc4 openssl + kdelibs kdebase_workspace phonon + libX11 libXext libXft + ]; + + meta = with stdenv.lib; { + description = "Binary news reader for KDE"; + }; +} diff --git a/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch b/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch new file mode 100644 index 00000000000..602002d0173 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch @@ -0,0 +1,19 @@ +--- kwooty-kwooty/src/utility.cpp 2012-01-24 22:22:45.091383072 +0100 ++++ kwooty-kwooty/src/utility.cpp 2012-01-24 22:29:08.526208140 +0100 +@@ -299,6 +299,7 @@ + + QString programPathName; + QStringList searchPathList = Settings::searchPathList(); ++ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; + + QStringList programsWithDifferentNames = programToSearch.split(";"); + +@@ -363,7 +364,7 @@ + QStringList niceProcessArgs; + + // look for 'nice' location : +- QString nicePath = KStandardDirs::findExe("nice"); ++ QString nicePath = QString("/usr/bin/nice"); + niceProcessArgs.append(nicePath); + niceProcessArgs.append("-n"); + diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/2.6.3.nix index c1cd4b42a02..c1cd4b42a02 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index 0df148ce390..325ab3b0a0f 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -2,15 +2,15 @@ , pcre, expat, boost, mpfr, git, texinfo }: let - rev = "cf35984971341b8a8688"; + rev = "d2915c66"; in stdenv.mkDerivation { - name = "ledger3-${rev}"; + name = "ledger3-2012.01.${rev}"; src = fetchgit { url = "git://github.com/jwiegley/ledger.git"; inherit rev; - sha256 = "4078983db9fc8d232fa71a31b47e505c531971b4515d6ef723e7d333a2352d2a"; + sha256 = "a489c8b1c48889040d2cebaac1a0019e90acac0b51c9abf7914944dcb4b801e7"; }; buildInputs = [ @@ -24,7 +24,8 @@ stdenv.mkDerivation { buildPhase = '' sed -i acprep \ - -e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|' + -e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|' \ + -e 's|/usr/bin/python|${python}/bin/python|' export MAKEFLAGS="-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" python acprep update --no-pch --prefix=$out ''; diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh new file mode 100644 index 00000000000..97bf2b32c9c --- /dev/null +++ b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +VERSIONBASE=3.4.5 + +VERSION=3.4.5.2 + +if [ $# -gt 2 ]; then + VERSIONBASE=$1 + VERSION=$2 +fi + +echo '{fetchurl} : [' + +for a in artwork base bootstrap calc components extensions extras filters \ + help impress libs-core libs-extern libs-extern-sys libs-gui postprocess \ + translations ure writer sdk testing; do + + URL=http://download.documentfoundation.org/libreoffice/src/$VERSIONBASE/libreoffice-$a-$VERSION.tar.bz2 + + echo '(fetchurl {' + echo " url = \"$URL\";" + echo " sha256 = \"`nix-prefetch-url $URL`\";" + echo '})' +done + +echo ']' diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/openoffice/libreoffice-srcs.nix new file mode 100644 index 00000000000..ed795c9a79f --- /dev/null +++ b/pkgs/applications/office/openoffice/libreoffice-srcs.nix @@ -0,0 +1,78 @@ +{fetchurl} : [ +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-artwork-3.4.5.2.tar.bz2"; + sha256 = "01vi1njw0agpvxi0141k2arzhgq1kjbda7sj1l0l304qj9n78b1q"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-base-3.4.5.2.tar.bz2"; + sha256 = "0f5rsyrn33iz0sny3wxsghv7c7yrbhas42yarb5rq958i3kpm6wz"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-calc-3.4.5.2.tar.bz2"; + sha256 = "1l00y0qj1s9m31jmqg7q7bczxa5xsng388nqc9zc3vd6zjf4xy9i"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-components-3.4.5.2.tar.bz2"; + sha256 = "1sq6yl06x006wxj1i89lv75sskb1bkxws82rcj1gvih6r8czih52"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-extensions-3.4.5.2.tar.bz2"; + sha256 = "18xhk9h9vl9qhwlgv8ks3xi6hls2vgnkygnz1yhpf4p2g2y6nv7z"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-extras-3.4.5.2.tar.bz2"; + sha256 = "0zxm30na6hzpjfasi1g890magf63kmg39y6y56wz9hv2z9p5q8jv"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-filters-3.4.5.2.tar.bz2"; + sha256 = "002qxqav39530csraq16ga4fnvw8v9wqbvp88b6lzi2m5yqpbl46"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-help-3.4.5.2.tar.bz2"; + sha256 = "1agsqzz73dmsy2jsw63qq1ljx4h0ppz7zwqllc7617yiak0rqsqq"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-impress-3.4.5.2.tar.bz2"; + sha256 = "0ivabx4wl7dkfalr0z4gqm5976phc6mkidnv1i580ixrf0zdz483"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-core-3.4.5.2.tar.bz2"; + sha256 = "0blwd58hf51iixikrjrlqdm6n40wv5k2c9c8krfzxfcvk20mvv4b"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-extern-3.4.5.2.tar.bz2"; + sha256 = "01cm3fjfj08a7b8i6iszml2ly1wa2hnkqqq1irvjb0wb1fjjxq3s"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2"; + sha256 = "1528n6mnlhpdhi9zfvqziwr6knsak212ghjww0jlfh31ky3whlh0"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-gui-3.4.5.2.tar.bz2"; + sha256 = "0win8si2yjkbfrwx46dw6as82iw7x4wd53cirncsrwvzksdqphcr"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-postprocess-3.4.5.2.tar.bz2"; + sha256 = "1rspqy1drfvj3rdfx8d7wbwn17vw08n26qmb98xwkgf5najdpfnp"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-translations-3.4.5.2.tar.bz2"; + sha256 = "0ngynrskq6h58gybswcpklj49cyvh0igksngbr0gz6n1yq3471iz"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-ure-3.4.5.2.tar.bz2"; + sha256 = "0wg06gbaq3ynqzaxaaqgxkjssxnggw6xqgfm63rmn9c1cd4q0mzy"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-writer-3.4.5.2.tar.bz2"; + sha256 = "0k7xf94abavdzpns1z13phl3vjz0xkfv2h5sn7rgpr3dy184klxh"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-sdk-3.4.5.2.tar.bz2"; + sha256 = "1f9iv875aw9sic4gl45ik1vx24gpq9iarjl673wz6l0wxr6hgrgw"; +}) +(fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-testing-3.4.5.2.tar.bz2"; + sha256 = "05sk3li5jgmjv722ncsr2i7arhmsvkkvmh4qw7xl70p8dpxhla8q"; +}) +] diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix new file mode 100644 index 00000000000..5fde0cfa285 --- /dev/null +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -0,0 +1,137 @@ +{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip +, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd +, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon +, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which +, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups +, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 +, autoconf, openldap, postgresql, bash +, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] +}: + +throw "The expression for libreoffice is still not ready" + +stdenv.mkDerivation rec { + name = "libreoffice-3.4.5.2"; + + srcs_download = import ./libreoffice-srcs.nix { inherit fetchurl; }; + + src = fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-bootstrap-3.4.5.2.tar.bz2"; + sha256 = "05xz6ykddrm6mrgl9jssr2xpg2ir0x6c1c3n1cph0mvd0hiz58x9"; + }; + + preConfigure = '' + sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' Makefile.in bin/unpack-sources + + # Needed to find genccode + PATH=$PATH:${icu}/sbin + ''; + + buildPhase = '' + for a in $srcs_download; do + FILE=$(basename $a) + # take out the hash + cp -v $a src/$(echo $FILE | sed 's/[^-]*-//') + done + + # Remove an exit 1, ignoring the lack of wget or curl + sed '/wget nor curl/{n;d}' -i download + ./download + + # Fix svtools: hardcoded jpeg path + sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk + # Fix sysui: wants to create a tar for root + sed -i -e 's,--own.*root,,' sysui/desktop/slackware/makefile.mk + # Fix libtextcat: wants to set rpath to /usr/local/lib + sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, libtextcat/makefile.mk + # Fix hunspell: the checks fail due to /bin/bash missing, and I find this fix easier + sed -i -e 's,make && make check,make,' hunspell/makefile.mk + # Fix redland: wants to set rpath to /usr/local/lib + sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \ + redland/raptor/makefile.mk redland/rasqal/makefile.mk + + # This to aovid using /lib:/usr/lib at linking + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk + + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + + make + ''; + + configureFlags = [ + # Helpful, while testing the expression + # "--with-num-cpus=4" + + "--enable-verbose" + + # Without these, configure does not finish + "--disable-gnome-vfs" + "--disable-gstreamer" + "--disable-opengl" + "--without-junit" + "--without-system-mythes" + + # Without this, it wants to download + "--with-cairo" + "--with-system-libs" + "--with-system-python" + "--with-system-boost" + "--with-system-db" + + # I imagine this helps. Copied from go-oo. + "--disable-epm" + "--disable-fontooo" + "--disable-gnome-vfs" + "--disable-gnome-vfs" + "--disable-mathmldtd" + "--disable-mozilla" + "--disable-odk" + "--disable-pasf" + "--disable-dbus" + "--disable-kde" + "--disable-kde4" + "--disable-mono" + "--with-package-format=native" + "--with-jdk-home=${jdk}" + "--with-ant-home=${ant}" + "--without-afms" + "--without-dict" + "--without-fonts" + "--without-myspell-dicts" + "--without-nas" + "--without-ppds" + "--without-system-agg" + "--without-system-beanshell" + "--without-system-hsqldb" + "--without-system-xalan" + "--without-system-xerces" + "--without-system-xml-apis" + "--without-system-xt" + "--without-system-jars" + "--without-system-hunspell" + "--without-system-altlinuxhyph" + "--without-system-lpsolve" + "--without-system-graphite" + "--without-system-mozilla" + "--without-system-libwps" + "--without-system-libwpg" + "--without-system-redland" + ]; + + buildInputs = [ + pam python tcsh libxslt perl ArchiveZip CompressZlib zlib + libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl + libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack + getopt file jdk cairo which icu boost libXext libX11 libXtst libXi + cups libXinerama openssl gperf GConf ORBit2 + ant autoconf openldap postgresql cppunit + ]; + + meta = { + description = "Libre-office, variant of openoffice.org"; + homepage = http://libreoffice.org/; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 870c80f6020..759bd66beb9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20120113"; + version = "3.20120123"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "060s96d5a6vx5alwkfgzsvwx1k9m81l6hbx4rnak9iy5iy28zd0z"; + sha256 = "dad93dad08ddfd0d239ee57bbf61dd2ee3755d9a94e2946ac5d7bb4cfa565488"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a5e4eb8e280..8381196196e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,14 +2,14 @@ , guiSupport ? false, tk ? null, ssl, curses }: let - name = "mercurial-2.0"; + name = "mercurial-2.0.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1565ns768vgvsqx6pn5q9r2670lmvq8y4zy0jwgwfx2h9n5bgymg"; + sha256 = "ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9"; }; inherit python; # pass it so that the same version can be used in hg2git @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = http://www.selenic.com/mercurial/; + homepage = "http://www.selenic.com/mercurial/"; license = "GPLv2"; }; } diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 348a5e7e323..0566b4bbe29 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -61,19 +61,19 @@ let license = "unfree"; }; } else null; - + ffmpegGit = fetchgit { url = "git://git.videolan.org/ffmpeg.git"; - rev = "80d156d"; - sha256 = "6d0124621491b8adc5f1bfb426ab137efc72dab99a89835aa3c30b970cb14004"; + rev = "9e53f62be1a171eaf9620958c225d42cf5142a30"; + sha256 = "be0ef2a394c82a0eee0be66bc0b943d37efb90f74ce1030aa89606109434c943"; }; - - mplayerRev = "33472"; + + mplayerRev = "34586"; in stdenv.mkDerivation rec { - name = "mplayer-r${mplayerRev}"; + name = "mplayer-${mplayerRev}"; src = fetchsvn { # Old kind of URL: @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { url = "svn://svn.mplayerhq.hu/mplayer/trunk"; rev = "${mplayerRev}"; - sha256 = "01b0b5x6li8c2m2mam7mabmk02npvprcwrim00a51sdlvqxh309v"; + sha256 = "5688add3256b5de8e0410194232aaaeb01531bb507459ffe4f07e69cb2d81bd7"; }; prePatch = '' diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 6db6e630d32..c133c90f8e9 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext -, qimageblitz, qjson, shared_mime_info, soprano }: +, qimageblitz, qjson, shared_mime_info, soprano, pkgconfig }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.8"; + version = "0.8.2.1"; src = fetchurl { url = "mirror://sourceforge/kdenlive/${name}.tar.gz"; - sha256 = "18e3390c9eb7124af5cd43819c679374aec46dcaf1fc5cdb43918db470c1076f"; + sha256 = "a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717"; }; - patches = [ ./kdenlive-newmlt.patch ]; + patches = [ ./qtgl-header-change.patch ]; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext - qimageblitz qjson shared_mime_info soprano ]; + qimageblitz qjson shared_mime_info soprano pkgconfig ]; meta = { description = "Free and open source video editor"; diff --git a/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch b/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch deleted file mode 100644 index b3a772a7ac6..00000000000 --- a/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch +++ /dev/null @@ -1,70 +0,0 @@ -From http://kdenlive.org/forum/cant-start-kdnlive-sdl-module-missing-mlt - -Kdenlive 0.8 tries to detect mlt by reading from stderr, but between -mlt 0.7.2 and 0.7.4 mlt this has changed from stderr to stdout. -=================================================================== ---- kdenlive-0.8/src.orig/wizard.cpp 2011-04-26 21:44:22.000000000 +0200 -+++ kdenlive-0.8/src/wizard.cpp 2011-07-21 18:22:18.470831892 +0200 -@@ -214,7 +214,7 @@ - button(QWizard::NextButton)->setEnabled(false); - } else { - checkProcess.waitForFinished(); -- QByteArray result = checkProcess.readAllStandardError(); -+ QByteArray result = checkProcess.readAllStandardOutput(); - - // Check MLT avformat module - QTreeWidgetItem *avformatItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Avformat module (FFmpeg)")); -@@ -246,7 +246,7 @@ - kDebug() << "// Error querying MLT's version"; - } else { - checkProcess.waitForFinished(); -- mltVersion = checkProcess.readAllStandardError(); -+ mltVersion = checkProcess.readAllStandardOutput(); - mltVersion = mltVersion.section('\n', 0, 0).simplified(); - mltVersion = mltVersion.section(' ', -1).simplified(); - version = 1000 * mltVersion.section('.', 0, 0).toInt() + 100 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); -@@ -275,7 +275,7 @@ - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); -- QByteArray codecList = checkProcess2.readAllStandardError(); -+ QByteArray codecList = checkProcess2.readAllStandardOutput(); - QString acodecList(codecList); - QStringList result; - QStringList alist = acodecList.split('\n', QString::SkipEmptyParts); -@@ -292,7 +292,7 @@ - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); -- QByteArray codecList = checkProcess2.readAllStandardError(); -+ QByteArray codecList = checkProcess2.readAllStandardOutput(); - QString vcodecList(codecList); - QStringList result; - QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts); -@@ -309,7 +309,7 @@ - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); -- QByteArray codecList = checkProcess2.readAllStandardError(); -+ QByteArray codecList = checkProcess2.readAllStandardOutput(); - QString vcodecList(codecList); - QStringList result; - QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts); -@@ -606,7 +606,7 @@ - - checkProcess.waitForFinished(); - -- QByteArray result = checkProcess.readAllStandardError(); -+ QByteArray result = checkProcess.readAllStandardOutput(); - if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");*/ - - QProcess checkProcess2; -@@ -616,7 +616,7 @@ - - checkProcess2.waitForFinished(); - -- QByteArray result = checkProcess2.readAllStandardError(); -+ QByteArray result = checkProcess2.readAllStandardOutput(); - if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + '\n'); - - if (!errorMessage.isEmpty()) { diff --git a/pkgs/applications/video/kdenlive/qtgl-header-change.patch b/pkgs/applications/video/kdenlive/qtgl-header-change.patch new file mode 100644 index 00000000000..91d9f13737b --- /dev/null +++ b/pkgs/applications/video/kdenlive/qtgl-header-change.patch @@ -0,0 +1,14 @@ +Correct for changed Qt opengl includes. +Reference: http://www.kdenlive.org/mantis/view.php?id=2396 + +diff -Naur kdenlive-0.8.2.1.orig//src/videoglwidget.cpp kdenlive-0.8.2.1/src/videoglwidget.cpp +--- kdenlive-0.8.2.1.orig//src/videoglwidget.cpp 2012-01-24 00:04:53.588121469 -0430 ++++ kdenlive-0.8.2.1/src/videoglwidget.cpp 2012-01-24 00:05:32.817410938 -0430 +@@ -2,6 +2,7 @@ + #include <QtGui> + #include <QtOpenGL> + #include "videoglwidget.h" ++#include "GL/glu.h" + + #ifndef GL_TEXTURE_RECTANGLE_EXT + #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 471a4c4a76f..8e11dd6068d 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, xlibs, libdvdnav , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib -, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf -, libvorbis, libtheora, speex, lua, libgcrypt, libupnp +, pkgconfig, dbus, fribidi, qt4, freefont_ttf +, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz @@ -10,29 +10,27 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "1.1.11"; + version = "1.1.13"; patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure''; src = fetchurl { - url = "mirror://sourceforge/vlc/${name}.tar.bz2"; - sha256 = "1jz1yklvh5apy2ygqwnyq61mhg09h0fn32hdygxfsaxq12z609b8"; + url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2"; + sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83"; }; buildInputs = [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread - pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt + dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi ] ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]); + buildNativeInputs = [ pkgconfig ]; + configureFlags = [ "--enable-alsa" - "--disable-glx" - "--disable-remoteosd" - "--disable-dbus" - "--disable-dbus-control" "--with-kde-solid=$out/share/apps/solid/actions" ]; |