From 3da4f68800da5bb796c971c33ccfbea9d16b398b Mon Sep 17 00:00:00 2001 From: Florian Paul Schmidt Date: Tue, 13 Oct 2015 11:33:52 +0200 Subject: [PATCH 1/4] alsa-tools: add initial package building everything except for a few nut cases --- pkgs/os-specific/linux/alsa-tools/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/os-specific/linux/alsa-tools/default.nix diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix new file mode 100644 index 000000000000..83bf71c4ccc3 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, alsaLib, pkgconfig, gtk, gtk3, fltk13 }: + +stdenv.mkDerivation rec { + name = "alsa-tools-${version}"; + version = "1.0.29"; + + src = fetchurl { + urls = [ + "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2" + "http://alsa.cybermirror.org/tools/${name}.tar.bz2" + ]; + sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl"; + }; + + enableParallelBuilding = true; + + phases = "unpackPhase patchPhase configurePhase buildPhase installPhase fixupPhase"; + + buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ]; + + patchPhase = '' + export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" + # export tools="as10k1 hda-verb hdspmixer qlo10k1 seq usx2yloader echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" + ''; + + configurePhase = '' + for tool in $tools; do + echo "Tool: $tool:" + cd "$tool"; ./configure --prefix="$out"; cd - + done + ''; + + buildPhase = '' + for tool in $tools; do + cd "$tool"; make; cd - + done + ''; + + installPhase = '' + for tool in $tools; do + cd "$tool"; make install; cd - + done + ''; + + meta = { + homepage = http://www.alsa-project.org/; + description = "ALSA, the Advanced Linux Sound Architecture tools"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ "Florian Paul Schmidt " ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31291b61d5c3..676da43beb4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9424,6 +9424,7 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; alsaOss = callPackage ../os-specific/linux/alsa-oss { }; + alsaTools = callPackage ../os-specific/linux/alsa-tools { }; microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; From 24b375ac06c97c3af58db9415ea05ad0d0ebe72c Mon Sep 17 00:00:00 2001 From: Florian Paul Schmidt Date: Tue, 13 Oct 2015 12:48:03 +0200 Subject: [PATCH 2/4] alsa-tools: update maintainer --- lib/maintainers.nix | 1 + pkgs/os-specific/linux/alsa-tools/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1b02bd371301..1eb2906c6a58 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -101,6 +101,7 @@ fluffynukeit = "Daniel Austin "; forkk = "Andrew Okin "; fpletz = "Franz Pletz "; + fps = "Florian Paul Schmidt "; fridh = "Frederik Rietdijk "; fro_ozen = "fro_ozen "; ftrvxmtrx = "Siarhei Zirukin "; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 83bf71c4ccc3..f3e014bde9dd 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ "Florian Paul Schmidt " ]; + maintainers = [ stdenv.lib.maintainers.fps ]; }; } From 583f16a87fbd40452f5397d796461d01515ce684 Mon Sep 17 00:00:00 2001 From: Florian Paul Schmidt Date: Tue, 13 Oct 2015 12:52:37 +0200 Subject: [PATCH 3/4] alsa-tools: do not mention phases explicitly --- pkgs/os-specific/linux/alsa-tools/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index f3e014bde9dd..a21cbce06663 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - phases = "unpackPhase patchPhase configurePhase buildPhase installPhase fixupPhase"; - buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ]; patchPhase = '' From d2a17851335a9242262709bf707c338fd6a3f72f Mon Sep 17 00:00:00 2001 From: Florian Paul Schmidt Date: Tue, 13 Oct 2015 13:05:44 +0200 Subject: [PATCH 4/4] alsa-tools: remove non-effective parallelBuilding statement --- pkgs/os-specific/linux/alsa-tools/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index a21cbce06663..a2e49f465e46 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl"; }; - enableParallelBuilding = true; - buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ]; patchPhase = ''