* alsa-util suddenly needs --disable-xmlto. Don't know why. Also got
rid of some old versions. svn path=/nixpkgs/branches/stdenv-updates/; revision=14062
This commit is contained in:
parent
013d8e5e3a
commit
090e1f1180
|
@ -1,14 +0,0 @@
|
||||||
args: with args;
|
|
||||||
|
|
||||||
rec {
|
|
||||||
alsaLib = (import ./common.nix) {
|
|
||||||
aName = "lib";
|
|
||||||
sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
|
|
||||||
} args;
|
|
||||||
|
|
||||||
alsaUtils = (import ./common.nix) {
|
|
||||||
aName = "utils";
|
|
||||||
sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
|
|
||||||
buildInputs = [alsaLib ncurses gettext];
|
|
||||||
} args;
|
|
||||||
}
|
|
|
@ -1,14 +0,0 @@
|
||||||
args: with args;
|
|
||||||
|
|
||||||
rec {
|
|
||||||
alsaLib = (import ./common.nix) {
|
|
||||||
aName = "lib";
|
|
||||||
sha256 = "1k96razf5h7blidh5ib54plcrfnbysvwm7vhvz28b4cy20zv66df";
|
|
||||||
} args;
|
|
||||||
|
|
||||||
alsaUtils = (import ./common.nix) {
|
|
||||||
aName = "utils";
|
|
||||||
sha256 = "10bj4pw2hp3f6qzkxsrlnvsxjlpqha696fn10gzdnnzym072skzb";
|
|
||||||
buildInputs = [alsaLib ncurses gettext];
|
|
||||||
} args;
|
|
||||||
}
|
|
|
@ -1,14 +1,18 @@
|
||||||
args: with args;
|
{fetchurl, stdenv, ncurses, gettext}:
|
||||||
|
|
||||||
|
let version = "1.0.19"; in
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
alsaLib = (import ./common.nix) {
|
alsaLib = import ./common.nix {
|
||||||
aName = "lib";
|
pkgName = "lib";
|
||||||
sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij";
|
sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij";
|
||||||
} args;
|
inherit fetchurl stdenv version;
|
||||||
|
};
|
||||||
|
|
||||||
alsaUtils = (import ./common.nix) {
|
alsaUtils = import ./common.nix {
|
||||||
aName = "utils";
|
pkgName = "utils";
|
||||||
sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z";
|
sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z";
|
||||||
buildInputs = [alsaLib ncurses gettext];
|
buildInputs = [alsaLib ncurses gettext];
|
||||||
} args;
|
inherit fetchurl stdenv version;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,21 @@
|
||||||
{aName, sha256, buildInputs ? [], propagatedBuildInputs ? [] } :
|
{ stdenv, fetchurl, pkgName, sha256, version
|
||||||
args: with args; stdenv.mkDerivation rec {
|
, buildInputs ? [], propagatedBuildInputs ? []
|
||||||
name = "alsa-" + aName + "-" + version;
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "alsa-${pkgName}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.alsa-project.org/pub/" + aName + "/" + name + ".tar.bz2";
|
url = "ftp://ftp.alsa-project.org/pub/${pkgName}/${name}.tar.bz2";
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit buildInputs propagatedBuildInputs;
|
inherit buildInputs propagatedBuildInputs;
|
||||||
|
|
||||||
|
configureFlags = "--disable-xmlto";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "ALSA, the Advanced Linux Sound Architecture (${aName})";
|
description = "ALSA, the Advanced Linux Sound Architecture (${pkgName})";
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
The Advanced Linux Sound Architecture (ALSA) provides audio and
|
The Advanced Linux Sound Architecture (ALSA) provides audio and
|
||||||
|
|
|
@ -6337,7 +6337,6 @@ let
|
||||||
|
|
||||||
alsa = import ../os-specific/linux/alsa/1.0.19.nix {
|
alsa = import ../os-specific/linux/alsa/1.0.19.nix {
|
||||||
inherit fetchurl stdenv ncurses gettext;
|
inherit fetchurl stdenv ncurses gettext;
|
||||||
version = "1.0.19";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
alsaLib = alsa.alsaLib;
|
alsaLib = alsa.alsaLib;
|
||||||
|
|
Loading…
Reference in New Issue