diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
| commit | 52d9c93abef582cfa32d94397aa86f0aa169917c (patch) | |
| tree | fd32d1eb551687c92a10487a0a877018791b73ff /pkgs/applications/audio | |
| parent | 629f7d055a8ec6815400affbfdd0a9f3384b0e2a (diff) | |
| parent | 777617f987c1e3e44f0f399582bc1b2e2f113c42 (diff) | |
| download | nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.gz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.bz2 nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.lz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.xz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.zst nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.zip | |
Merge 'staging' into master
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/flac/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/audio/mixxx/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/audio/praat/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 1c8dc56de61..fe4b43539d4 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg ]; - doCheck = true; # takes lots of time but will be run rarely (small build-time closure) + #doCheck = true; # takes lots of time meta = with stdenv.lib; { homepage = http://xiph.org/flac/; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index b76eecc9e4a..e3422d4ba06 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ensureDir "$out" + mkdir -p "$out" scons \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ $sconsFlags "prefix=$out" diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 4859377ab52..86c68d087b7 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp praat $out/bin ''; |