mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Added old flac (as an option): kde4 needs it
svn path=/nixpkgs/trunk/; revision=10355
This commit is contained in:
parent
5dcb97fcc1
commit
756ff550af
2 changed files with 19 additions and 12 deletions
|
@ -1,11 +1,16 @@
|
|||
{stdenv, fetchurl, libogg}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "flac-1.2.1";
|
||||
src = fetchurl {
|
||||
url = http://downloads.xiph.org/releases/flac/flac-1.2.1.tar.gz;
|
||||
sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
|
||||
};
|
||||
|
||||
buildInputs = [libogg] ;
|
||||
}
|
||||
args: with args;
|
||||
let
|
||||
flacFun = version: hash:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flac-${version}";
|
||||
src = fetchurl ({
|
||||
url = "http://downloads.xiph.org/releases/flac/${name}.tar.gz";
|
||||
} // hash);
|
||||
buildInputs = [libogg];
|
||||
};
|
||||
in
|
||||
stdenv.lib.listOfListsToAttrs [
|
||||
[ "default" (flacFun "1.2.1" { sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }) ]
|
||||
[ "1.2.1" (flacFun "1.2.1" { sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }) ]
|
||||
[ "1.1.2" (flacFun "1.1.2" { md5 = "2bfc127cdda02834d0491ab531a20960"; }) ]
|
||||
]
|
||||
|
|
|
@ -4263,10 +4263,12 @@ rec {
|
|||
firefox3b1Wrapper = lowPrio (wrapFirefox firefox3b1 "");
|
||||
firefox3b1BinWrapper = lowPrio (wrapFirefox firefox3b1Bin "");
|
||||
|
||||
flac = import ../applications/audio/flac {
|
||||
flacAlts = import ../applications/audio/flac {
|
||||
inherit fetchurl stdenv libogg;
|
||||
};
|
||||
|
||||
flac = getVersion "flac" flacAlts;
|
||||
|
||||
flashplayer = flashplayer9;
|
||||
|
||||
flashplayer7 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-7 {
|
||||
|
|
Loading…
Reference in a new issue