diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2008-01-10 13:37:32 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2008-01-10 13:37:32 +0000 |
| commit | 20b0e14c6f69685128ecda802e3cb95a4ddcf04d (patch) | |
| tree | eda060c0066e139e2457ba3a5bc7cd4b676bbe19 | |
| parent | 4e15efefeabfa6e8c147f35cf6554b84ae9f5e80 (diff) | |
| download | nixpkgs-20b0e14c6f69685128ecda802e3cb95a4ddcf04d.tar nixpkgs-20b0e14c6f69685128ecda802e3cb95a4ddcf04d.tar.gz nixpkgs-20b0e14c6f69685128ecda802e3cb95a4ddcf04d.tar.bz2 nixpkgs-20b0e14c6f69685128ecda802e3cb95a4ddcf04d.tar.lz nixpkgs-20b0e14c6f69685128ecda802e3cb95a4ddcf04d.tar.xz nixpkgs-20b0e14c6f69685128ecda802e3cb95a4ddcf04d.tar.zst nixpkgs-20b0e14c6f69685128ecda802e3cb95a4ddcf04d.zip | |
libdv added
svn path=/nixpkgs/trunk/; revision=10111
| -rw-r--r-- | pkgs/development/libraries/libdv/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 38 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix new file mode 100644 index 00000000000..4b0e05acf98 --- /dev/null +++ b/pkgs/development/libraries/libdv/default.nix @@ -0,0 +1,30 @@ +args: +let edf = args.lib.enableDisableFeature; in +( args.mkDerivationByConfiguration { + flagConfig = { } + # TODO! implement flags + # I want to get kino and cinelerra working. That's why I don't spend more time on this now + // edf "libtool_lock" "libtool_lock" { } #avoid locking (might break parallel builds) + // edf "asm" "asm" { } #disable use of architecture specific assembly code + // edf "sdl" "sdl" { } #enable use of SDL for display + // edf "gtk" "gtk" { } #disable use of gtk for display + // edf "xv" "xv" { } #disable use of XVideo extension for display + // edf "gprof" "gprof" { } #enable compiler options for gprof profiling + ; + + extraAttrs = co : { + name = "libdv-1.0.0"; + + src = args.fetchurl { + url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz; + sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; + }; + + meta = { + description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; + homepage = http://sourceforge.net/projects/libdv/; + # you can choose one of the following licenses: + license = []; + }; + }; +} ) args diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3b40a2e305..1d601998573 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2050,6 +2050,10 @@ rec { inherit sqlite; } null; + libdv = import ../development/libraries/libdv { + lib = lib_unstable; + inherit fetchurl stdenv mkDerivationByConfiguration; + }; libdrm = import ../development/libraries/libdrm { inherit fetchurl stdenv; @@ -3304,8 +3308,10 @@ rec { { # resume with resume=swap:/dev/xx name = "tux on ice"; # (swsusp2) patch = fetchurl { - url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc2-for-2.6.23.1.patch.bz2"; - sha256 = "ef86267b6f3d7e309221f5173a881afae1dfa57418be5b3963f2380b0633ca1a"; + #url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc2-for-2.6.23.1.patch.bz2"; + #sha256 = "ef86267b6f3d7e309221f5173a881afae1dfa57418be5b3963f2380b0633ca1a"; + url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc3-for-2.6.23.9.patch.bz2"; + sha256 = "16f61cn0mdi7yklhdx4isi7c85843fzxq2cifd05cpsl6x6ilrfk"; }; extraConfig = " CONFIG_SUSPEND2=y |