diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-10 13:07:21 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-10 13:07:21 +0100 |
| commit | 287144e34258f353425ba78817439df1f2c9e80d (patch) | |
| tree | ec96c46c08855adc24b3664395b20974bd6923ea /pkgs/tools/video | |
| parent | 528664e3bb33bae66d4ce41877fe573395010dd9 (diff) | |
| parent | e0fd84cf439f39d31e2c317b228b0c035cc6211d (diff) | |
| download | nixpkgs-287144e34258f353425ba78817439df1f2c9e80d.tar nixpkgs-287144e34258f353425ba78817439df1f2c9e80d.tar.gz nixpkgs-287144e34258f353425ba78817439df1f2c9e80d.tar.bz2 nixpkgs-287144e34258f353425ba78817439df1f2c9e80d.tar.lz nixpkgs-287144e34258f353425ba78817439df1f2c9e80d.tar.xz nixpkgs-287144e34258f353425ba78817439df1f2c9e80d.tar.zst nixpkgs-287144e34258f353425ba78817439df1f2c9e80d.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/video')
| -rw-r--r-- | pkgs/tools/video/bento4/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/video/bento4/libap4.patch | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 75964a3c2e5..d1c6f310df9 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -3,16 +3,21 @@ }: stdenv.mkDerivation rec { name = "bento4-${version}"; - version = "1.5.1-624"; + version = "1.5.1-627"; src = fetchFromGitHub { owner = "axiomatic-systems"; repo = "Bento4"; rev = "v${version}"; - sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf"; + sha256 = "1nczv7vqgjryzdn9vkxz93awd7zyj5kwiz8llbb25nnqnqgfq170"; }; + patches = [ ./libap4.patch ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + installPhase = '' mkdir -p $out/{lib,bin} find -iname '*.so' -exec mv --target-directory="$out/lib" {} \; diff --git a/pkgs/tools/video/bento4/libap4.patch b/pkgs/tools/video/bento4/libap4.patch new file mode 100644 index 00000000000..ca2936003b8 --- /dev/null +++ b/pkgs/tools/video/bento4/libap4.patch @@ -0,0 +1,5 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36 +36 @@ endif() +-add_library(ap4 STATIC ${AP4_SOURCES}) ++add_library(ap4 ${AP4_SOURCES}) |