diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/libav | |
parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
download | nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/development/libraries/libav')
-rw-r--r-- | pkgs/development/libraries/libav/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 0cbda2e14051..d0a40d7e8d08 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,17 +26,17 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685"; - libav_9 = libavFun "9.16" "18378gdgzqsxaacc9vl7ligwndbdvy95wbn50hs8xvdqn1rn916a"; - libav_10 = libavFun "10.4" "1zzvjfdlv9swhq7dzvli1pk8cn02q1076ax9m3cx9ipilbg21639"; + libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; + libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714"; + libav_11 = libavFun "11.3" "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a"; }; - libavFun = version : sha256 : stdenv.mkDerivation rec { + libavFun = version : sha1 : stdenv.mkDerivation rec { name = "libav-${version}"; src = fetchurl { url = "${meta.homepage}/releases/${name}.tar.xz"; - inherit sha256; + inherit sha1; # upstream directly provides sha1 of releases over https }; configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; @@ -77,12 +77,12 @@ let enableParallelBuilding = true; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "dev" "out" "bin" ]; #TODO: re-check + # move avplay to get rid of the SDL dependency in the main output postInstall = '' mkdir -p "$bin/bin" mv "$out/bin/avplay" "$bin/bin" - cp -s "$out"/bin/* "$bin/bin/" ''; doInstallCheck = false; # fails randomly |