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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-20 10:01:49 +01:00
parent 13bab298fc 648152fdbb
commit 65edeb8633
236 changed files with 2532 additions and 2637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg/2.8.nix
View File

@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
callPackage ./generic.nix (rec {
version = "${branch}.14";
branch = "2.8";
sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn";
})
} // args)

4
pkgs/development/libraries/ffmpeg/3.4.nix
View File

@@ -4,9 +4,9 @@
, ...
}@args:
callPackage ./generic.nix (args // rec {
callPackage ./generic.nix (rec {
version = branch;
branch = "3.4.6";
sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b";
darwinFrameworks = [ Cocoa CoreMedia ];
})
} // args)

4
pkgs/development/libraries/ffmpeg/4.nix
View File

@@ -4,9 +4,9 @@
, ...
}@args:
callPackage ./generic.nix (args // rec {
callPackage ./generic.nix (rec {
version = "4.2.1";
branch = "4.2";
sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
})
} // args)