public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libav_all: use callPackages instead of callPackage

Browse Source
This commit is contained in:
Aaron Andersen 2020-05-27 10:20:21 -04:00 committed by Jon
parent a68011ec05
commit 996cc9e845
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/musly/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: { stdenv, fetchFromGitHub, cmake, eigen, libav }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "musly"; pname = "musly";
version = "unstable-2017-04-26"; version = "unstable-2017-04-26";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ]; buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ];
fixupPhase = if stdenv.isDarwin then '' fixupPhase = if stdenv.isDarwin then ''
install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly 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 install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly

2
pkgs/top-level/all-packages.nix
View File

@ -13094,7 +13094,7 @@ in
libaudclient = callPackage ../development/libraries/libaudclient { }; libaudclient = callPackage ../development/libraries/libaudclient { };
libav = libav_11; # branch 11 is API-compatible with branch 10 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; inherit (libav_all) libav_0_8 libav_11 libav_12;
libavc1394 = callPackage ../development/libraries/libavc1394 { }; libavc1394 = callPackage ../development/libraries/libavc1394 { };