From b4e8dd31210d94a9712bf231ad9aef32360c31fa Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 4 Apr 2019 15:37:35 +0200 Subject: [PATCH] ma pkgs.bento4: rip (upstreamed) init-host: put into configs to still be able to push to NUR --- .../tools}/init-host/default.nix | 0 5pkgs/bento4/default.nix | 29 ------------------- 5pkgs/default.nix | 2 +- 3 files changed, 1 insertion(+), 30 deletions(-) rename {5pkgs => 2configs/tools}/init-host/default.nix (100%) delete mode 100644 5pkgs/bento4/default.nix diff --git a/5pkgs/init-host/default.nix b/2configs/tools/init-host/default.nix similarity index 100% rename from 5pkgs/init-host/default.nix rename to 2configs/tools/init-host/default.nix diff --git a/5pkgs/bento4/default.nix b/5pkgs/bento4/default.nix deleted file mode 100644 index 6f5f1de..0000000 --- a/5pkgs/bento4/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub -, cmake -}: -stdenv.mkDerivation rec { - name = "bento4-${version}"; - version = "1.5.1-624"; - - src = fetchFromGitHub { - owner = "axiomatic-systems"; - repo = "Bento4"; - rev = "v${version}"; - sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf"; - }; - - nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir -p $out/{lib,bin} - find -iname '*.so' -exec mv --target-directory="$out/lib" {} \; - find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \; - ''; - - meta = with stdenv.lib; { - description = "Full-featured MP4 format and MPEG DASH library and tools"; - homepage = http://bento4.com; - license = licenses.gpl3; - maintainers = with maintainers; [ makefu ]; - platforms = with platforms; linux; - }; -} diff --git a/5pkgs/default.nix b/5pkgs/default.nix index 8ae4142..1ae1045 100644 --- a/5pkgs/default.nix +++ b/5pkgs/default.nix @@ -1,4 +1,4 @@ -self: super: +self: super: with super.lib; with builtins; let # This callPackage will try to detect obsolete overrides. callPackage = path: args: let