diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index b1e8822cdcf..7ef2b400b76 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: +{ stdenv, fetchFromGitHub, cmake, eigen, libav }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ]; + buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f82bce86d7..54f6c26761b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13094,7 +13094,7 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; libav = libav_11; # branch 11 is API-compatible with branch 10 - libav_all = callPackage ../development/libraries/libav { }; + libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; libavc1394 = callPackage ../development/libraries/libavc1394 { };