diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-05-03 13:24:31 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-05-03 13:24:31 +0000 |
| commit | a5ebd913f3f07e7504e29eafd19cd02a551fdd93 (patch) | |
| tree | b01c2e6dc6e323faa97ad4f52e926fb1db804e9c /pkgs | |
| parent | 76863c4bf7ded86b0722b90e2fa4c6285ab33d65 (diff) | |
| download | nixlib-a5ebd913f3f07e7504e29eafd19cd02a551fdd93.tar nixlib-a5ebd913f3f07e7504e29eafd19cd02a551fdd93.tar.gz nixlib-a5ebd913f3f07e7504e29eafd19cd02a551fdd93.tar.bz2 nixlib-a5ebd913f3f07e7504e29eafd19cd02a551fdd93.tar.lz nixlib-a5ebd913f3f07e7504e29eafd19cd02a551fdd93.tar.xz nixlib-a5ebd913f3f07e7504e29eafd19cd02a551fdd93.tar.zst nixlib-a5ebd913f3f07e7504e29eafd19cd02a551fdd93.zip | |
Updating xvidcap.
svn path=/nixpkgs/trunk/; revision=15432
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/xvidcap/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 784af50a6eeb..9d7f8a6ac992 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk -, scrollkeeper, libglade, libXmu, libXext}: +, scrollkeeper, libglade, libXmu, libX11, libXext, gettext, lame, libXfixes, libXdamage}: stdenv.mkDerivation { - name = "xvidcap-1.1.4p1"; + name = "xvidcap-1.1.7"; src = fetchurl { - url = mirror://sourceforge/xvidcap/xvidcap-1.1.4p1.tar.gz; - md5 = "35a038dba807f6e09f1d9dd2bc0c5719"; + url = mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz; + sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; }; - - buildInputs = [perl perlXMLParser pkgconfig gtk scrollkeeper libglade libXmu]; + + patches = [ ./xlib.patch ]; + buildInputs = [perl perlXMLParser pkgconfig gtk scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11]; # !!! don't know why this is necessary - NIX_LDFLAGS = "-rpath ${libXext}/lib"; + NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s"; meta = { description = "screencast video catpuring tool"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c10ed0fdbe0..d08c0824071f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7048,10 +7048,10 @@ let }; xvidcap = import ../applications/video/xvidcap { - inherit fetchurl stdenv perl perlXMLParser pkgconfig; + inherit fetchurl stdenv perl perlXMLParser pkgconfig gettext lame; inherit (gtkLibs) gtk; inherit (gnome) scrollkeeper libglade; - inherit (xlibs) libXmu libXext; + inherit (xlibs) libXmu libXext libXfixes libXdamage libX11; }; # doesn't compile yet - in case someone else want's to continue .. |