summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-04-04 15:37:35 +0200
committermakefu <github@syntax-fehler.de>2019-04-04 15:39:48 +0200
commit854bd37b06a4bddcf5d71e7c6a2264eaac66c928 (patch)
treec197d14bce42ca62774a97073fba77f54ba0e505 /makefu
parentb162f79087cf0d02948a1cd76697e4958fd37e59 (diff)
ma pkgs.bento4: rip (upstreamed)
init-host: put into configs to still be able to push to NUR
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/tools/init-host/default.nix (renamed from makefu/5pkgs/init-host/default.nix)0
-rw-r--r--makefu/5pkgs/bento4/default.nix29
-rw-r--r--makefu/5pkgs/default.nix2
3 files changed, 1 insertions, 30 deletions
diff --git a/makefu/5pkgs/init-host/default.nix b/makefu/2configs/tools/init-host/default.nix
index d1d3f7195..d1d3f7195 100644
--- a/makefu/5pkgs/init-host/default.nix
+++ b/makefu/2configs/tools/init-host/default.nix
diff --git a/makefu/5pkgs/bento4/default.nix b/makefu/5pkgs/bento4/default.nix
deleted file mode 100644
index 6f5f1deba..000000000
--- a/makefu/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/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8ae41427c..1ae10459f 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/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