git.iko.soy/typeable/nixpkgs
on master help sign in
libav_all: use callPackages instead of callPackage
commit996cc9e845eb0c067c249eb174ba8d76633944ea authorAaron Andersen <aaron@fosslib.net> dateWed 27 May 2020, 10:20 (6 years ago) parenta68011e
2 files changed+3−3
pkgs/applications/audio/musly/default.nix+2−2 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/audio/musly/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }:
1+{ stdenv, fetchFromGitHub, cmake, eigen, libav }:
22stdenv.mkDerivation {
33 pname = "musly";
44 version = "unstable-2017-04-26";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
1010 };
1111 nativeBuildInputs = [ cmake ];
12− buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ];
12+ buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ];
1313 fixupPhase = if stdenv.isDarwin then ''
1414 install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
1515 install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly
pkgs/top-level/all-packages.nix+1−1
@@ -13094,7 +13094,7 @@ in
1309413094 libaudclient = callPackage ../development/libraries/libaudclient { };
1309513095
1309613096 libav = libav_11; # branch 11 is API-compatible with branch 10
13097− libav_all = callPackage ../development/libraries/libav { };
13097+ libav_all = callPackages ../development/libraries/libav { };
1309813098 inherit (libav_all) libav_0_8 libav_11 libav_12;
1309913099
1310013100 libavc1394 = callPackage ../development/libraries/libavc1394 { };