Allow ffmpeg attributes to be overridden

Switch the order in which the version-specific attributes are combined
with args. Otherwise, if args such as 'branch' are overridden by an
overlay or other derivation, the new value is replaced with the
original when the sets are combined with //.
This commit is contained in:
Tom Hall 2019-10-28 19:57:08 +00:00 committed by Lassulus
parent 14961b1034
commit 801e8b4d72
3 changed files with 6 additions and 6 deletions

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)

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)

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)