diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/video')
51 files changed, 699 insertions, 596 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/bombono/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/bombono/default.nix index 2ae3722fff2e..05ba5ef19be7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/bombono/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/bombono/default.nix @@ -1,54 +1,80 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons, -mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3, -enca, pkgconfig, fetchpatch }: - -let fetchPatchFromAur = {name, sha256}: -fetchpatch { - inherit name sha256; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; -}; in +{ stdenv +, fetchFromGitHub +, pkgconfig +, fetchpatch +, scons +, boost +, dvdauthor +, dvdplusrwtools +, enca +, ffmpeg_3 +, gettext +, gtk2 +, gtkmm2 +, libdvdread +, libxmlxx +, mjpegtools +, wrapGAppsHook +}: + +let + fetchPatchFromAur = {name, sha256}: + fetchpatch { + inherit name sha256; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; + }; +in stdenv.mkDerivation rec { pname = "bombono"; version = "1.2.4"; + src = fetchFromGitHub { - owner = "muravjov"; + owner = "bombono-dvd"; repo = "bombono-dvd"; rev = version; - sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9"; + sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM="; }; patches = [ (fetchpatch { name = "bombono-dvd-1.2.4-scons3.patch"; url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457"; - sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4"; + sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA="; }) ] ++ (map fetchPatchFromAur [ - {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} - {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} - {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} - {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} - {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} - {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} - {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} - {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} + {name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";} + {name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";} + {name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";} + {name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";} + {name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";} + {name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";} + {name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";} + {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} ]); nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; buildInputs = [ - gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools - libxmlxx ffmpeg_3 enca - ]; + boost + dvdauthor + dvdplusrwtools + enca + ffmpeg_3 + gtk2 + gtkmm2 + libdvdread + libxmlxx + mjpegtools + ]; prefixKey = "PREFIX="; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "a DVD authoring program for personal computers"; - homepage = "http://www.bombono.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ symphorien ]; + homepage = "https://www.bombono.org/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ symphorien ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/clipgrab/default.nix index f8b74a175474..fa6cf88440f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.14"; + version = "3.9.5"; src = fetchurl { - sha256 = "19337qjxwlkpdnnh6q0y4b8askk17a8zb88gifznllrk06a6pgyf"; + sha256 = "1p8pqa5s70basdm2zpmahc54shsxrr0fr7chvv425n5a9sqba4dh"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/devede/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/devede/default.nix index 9bb5518e80f7..921548b5c08c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/devede/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/devede/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools; - -in buildPythonApplication { - name = "devede-4.8.8"; +in buildPythonApplication rec { + pname = "devede"; + version = "4.16.0"; namePrefix = ""; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "rastersoft"; repo = "devedeng"; - rev = "c518683fbcd793aa92249e4fecafc3c3fea7da68"; - sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q"; + rev = version; + sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg"; }; # Temporary fix diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/dvb-apps/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/dvb-apps/default.nix deleted file mode 100644 index 8fa88e324494..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/dvb-apps/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, perl }: - -stdenv.mkDerivation { - name = "dvb-apps-7f68f9c8d311"; - - src = fetchurl { - url = "https://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz"; - sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82"; - }; - - buildInputs = [ perl ]; - - dontConfigure = true; # skip configure - - installPhase = "make prefix=$out install"; - - meta = { - description = "Linux DVB API applications and utilities"; - homepage = "https://linuxtv.org/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - broken = true; # 2018-04-10 - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/default.nix index e57f46c8c6ad..62aa54ca7844 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/default.nix @@ -1,6 +1,27 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bash, nodejs, nodePackages, gzip }: +{ stdenv +, fetchFromGitHub +, common-updater-scripts +, genericUpdater +, writers +, makeWrapper +, bash +, nodejs +, nodePackages +, gzip +, jq +}: let + # NOTE: use updateScript to bump the package version + pname = "EPGStation"; + version = "1.7.5"; + src = fetchFromGitHub { + owner = "l3tnun"; + repo = "EPGStation"; + rev = "v${version}"; + sha256 = "06yaf5yb5rp3q0kdhw33df7px7vyfby885ckb6bdzw3wnams5d8m"; + }; + workaround-opencollective-buildfailures = stdenv.mkDerivation { # FIXME: This should be removed when a complete fix is available # https://github.com/svanderburg/node2nix/issues/145 @@ -12,67 +33,73 @@ let chmod +x $out/bin/opencollective-postinstall ''; }; -in -nodePackages.epgstation.override (drv: { - src = fetchFromGitHub { - owner = "l3tnun"; - repo = "EPGStation"; - rev = "v${drv.version}"; # version specified in ./generate.sh - sha256 = "15z1kdbamj97frp3dfnbm0h8krihmv2xdab4id0rxin29ibrw1k2"; - }; - buildInputs = [ bash ]; - nativeBuildInputs = [ - workaround-opencollective-buildfailures - makeWrapper - nodePackages.node-pre-gyp - ]; - - preRebuild = '' - # Fix for not being able to connect to mysql using domain sockets. - patch -p1 ${./use-mysql-over-domain-socket.patch} - ''; - - postInstall = let - runtimeDeps = [ nodejs bash ]; - in - '' - mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} - - pushd $out/lib/node_modules/EPGStation - - npm run build - npm prune --production - - mv config/{enc.sh,enc.js} $out/libexec - mv LICENSE Readme.md $out/share/doc/epgstation - mv doc/* $out/share/doc/epgstation - sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ - | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz - rm -rf doc - - # just log to stdout and let journald do its job - rm -rf logs - - # Replace the existing configuration and runtime state directories with - # symlinks. Without this, they would all be non-writable because they reside - # in the Nix store. Note that the source path won't be accessible at build - # time. - rm -r config data recorded thumbnail - ln -sfT /etc/epgstation config - ln -sfT /var/lib/epgstation data - ln -sfT /var/lib/epgstation/recorded recorded - ln -sfT /var/lib/epgstation/thumbnail thumbnail - - makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ - --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} - - popd - ''; - - meta = with stdenv.lib; drv.meta // { - maintainers = with maintainers; [ midchildan ]; + pkg = nodePackages.epgstation.override (drv: { + inherit src; + + buildInputs = [ bash ]; + nativeBuildInputs = [ + workaround-opencollective-buildfailures + makeWrapper + nodePackages.node-pre-gyp + ]; + + preRebuild = '' + # Fix for not being able to connect to mysql using domain sockets. + patch -p1 ${./use-mysql-over-domain-socket.patch} + ''; + + postInstall = let + runtimeDeps = [ nodejs bash ]; + in + '' + mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} + + pushd $out/lib/node_modules/EPGStation + + npm run build + npm prune --production + + mv config/{enc.sh,enc.js} $out/libexec + mv LICENSE Readme.md $out/share/doc/epgstation + mv doc/* $out/share/doc/epgstation + sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ + | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz + rm -rf doc + + # just log to stdout and let journald do its job + rm -rf logs + + # Replace the existing configuration and runtime state directories with + # symlinks. Without this, they would all be non-writable because they + # reside in the Nix store. Note that the source path won't be accessible + # at build time. + rm -r config data recorded thumbnail + ln -sfT /etc/epgstation config + ln -sfT /var/lib/epgstation data + ln -sfT /var/lib/epgstation/recorded recorded + ln -sfT /var/lib/epgstation/thumbnail thumbnail + + makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ + --run "cd $out/lib/node_modules/EPGStation" \ + --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} + + popd + ''; + + # NOTE: this may take a while since it has to update all packages in + # nixpkgs.nodePackages + passthru.updateScript = import ./update.nix { + inherit (stdenv) lib; + inherit (src.meta) homepage; + inherit + pname + version + common-updater-scripts + genericUpdater + writers + jq; + }; # nodePackages.epgstation is a stub package to fetch npm dependencies and # is marked as broken to prevent users from installing it directly. This @@ -80,6 +107,16 @@ nodePackages.epgstation.override (drv: { # nixpkgs while still allowing us to heavily customize the build. It also # allows us to provide devDependencies for the epgstation build process # without doing the same for all the other node packages. - broken = false; + meta = drv.meta // { broken = false; }; + }); +in +pkg // { + name = "${pname}-${version}"; + + meta = with stdenv.lib; pkg.meta // { + maintainers = with maintainers; [ midchildan ]; + + # NOTE: updateScript relies on this being correct + position = toString ./default.nix + ":1"; }; -}) +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/generate.sh b/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/generate.sh deleted file mode 100755 index d193a015064c..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/generate.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -# Script to generate the Nix package definition for EPGStation. Run this script -# when bumping the package version. - -VERSION="1.7.4" -URL="https://raw.githubusercontent.com/l3tnun/EPGStation/v$VERSION/package.json" -JQ_BIN="$(nix-build ../../../.. --no-out-link -A jq)/bin/jq" - -set -eu -o pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -main() { - # update package.json - curl -sSfL "$URL" \ - | jq '. + {"dependencies": (.devDependencies + .dependencies)} | del(.devDependencies)' \ - > package.json - - # regenerate node packages to update the actual Nix package - pushd ../../../development/node-packages \ - && ./generate.sh - popd - - # generate default streaming settings for EPGStation - pushd ../../../../nixos/modules/services/video/epgstation \ - && cat "$(./generate)" > streaming.json - popd -} - -jq() { - "$JQ_BIN" "$@" -} - -main "@" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/package.json b/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/package.json index 96525ec809ec..53b1ebca2da7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/package.json +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/package.json @@ -1,23 +1,7 @@ { "name": "EPGStation", - "version": "1.7.4", + "version": "1.7.5", "description": "DTV Software in Japan.", - "main": "dist/server/index.js", - "scripts": { - "start": "node dist/server/index.js", - "dev-start": "node dist/server/index.js --env development", - "clean": "gulp clean", - "build": "gulp build --max_old_space_size=768 --env production", - "dev-build": "gulp build --max_old_space_size=512 --env development", - "test": "echo \"Error: no test specified\" && exit 1", - "task": "gulp --max_old_space_size=512", - "install-win-service": "winser -i -a", - "uninstall-win-service": "winser -r -x", - "backup": "node dist/server/DBTools.js -m backup -o", - "restore": "node dist/server/DBTools.js -m restore -o", - "move-log": "node dist/server/LogFileMoveTools.js", - "convert-str": "node dist/server/ConvertDBStrTools.js" - }, "repository": { "type": "git", "url": "https://github.com/l3tnun/EPGStation.git" @@ -32,41 +16,6 @@ "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" }, "dependencies": { - "@types/basic-auth": "1.1.3", - "@types/body-parser": "1.19.0", - "@types/chart.js": "2.9.23", - "@types/express": "4.17.7", - "@types/hls.js": "0.13.0", - "@types/js-yaml": "3.12.5", - "@types/lodash": "4.14.158", - "@types/material-design-lite": "1.1.16", - "@types/minimist": "1.2.0", - "@types/mithril": "2.0.3", - "@types/mkdirp": "1.0.1", - "@types/multer": "1.4.3", - "@types/mysql": "2.15.15", - "@types/node": "14.0.26", - "@types/pg": "7.14.4", - "@types/request": "2.48.5", - "@types/socket.io": "2.1.10", - "@types/socket.io-client": "1.4.33", - "@types/sqlite3": "3.1.6", - "@types/url-join": "4.0.0", - "del": "5.1.0", - "gulp": "4.0.2", - "gulp-clean-css": "4.3.0", - "gulp-concat": "2.6.1", - "gulp-dart-sass": "1.0.2", - "gulp-plumber": "1.2.1", - "gulp-sourcemaps": "2.6.5", - "gulp-tslint": "8.1.4", - "gulp-typescript": "5.0.1", - "terser-webpack-plugin": "3.0.7", - "ts-loader": "8.0.1", - "tslint": "6.1.2", - "typescript": "3.9.7", - "webpack": "4.44.0", - "webpack-stream": "5.2.1", "aribts": "^2.1.12", "b24.js": "1.0.3", "basic-auth": "2.0.1", @@ -75,27 +24,62 @@ "css-ripple-effect": "1.0.5", "diskusage": "1.1.3", "express": "4.17.1", - "express-openapi": "7.0.0", + "express-openapi": "7.0.1", "fs-extra": "9.0.1", "hls-b24.js": "0.12.3", "js-yaml": "3.14.0", - "lodash": "4.17.19", + "lodash": "4.17.20", "log4js": "6.3.0", "material-design-icons": "3.0.1", "material-design-lite": "1.3.0", "minimist": "1.2.5", - "mirakurun": "3.2.0", + "mirakurun": "3.3.1", "mithril": "2.0.4", "mkdirp": "1.0.4", "multer": "1.4.2", "mysql": "2.18.1", - "openapi-types": "7.0.0", - "pg": "8.3.0", + "openapi-types": "7.0.1", + "pg": "8.3.3", "request": "2.88.2", "socket.io": "2.3.0", "socket.io-client": "2.3.0", "sqlite3": "5.0.0", - "swagger-ui-dist": "3.30.2", - "url-join": "4.0.1" + "swagger-ui-dist": "3.34.0", + "url-join": "4.0.1", + "@types/basic-auth": "1.1.3", + "@types/body-parser": "1.19.0", + "@types/chart.js": "2.9.24", + "@types/express": "4.17.8", + "@types/hls.js": "0.13.1", + "@types/js-yaml": "3.12.5", + "@types/lodash": "4.14.161", + "@types/material-design-lite": "1.1.16", + "@types/minimist": "1.2.0", + "@types/mithril": "2.0.3", + "@types/mkdirp": "1.0.1", + "@types/multer": "1.4.4", + "@types/mysql": "2.15.15", + "@types/node": "14.11.1", + "@types/pg": "7.14.5", + "@types/request": "2.48.5", + "@types/socket.io": "2.1.11", + "@types/socket.io-client": "1.4.33", + "@types/sqlite3": "3.1.6", + "@types/url-join": "4.0.0", + "del": "5.1.0", + "gulp": "4.0.2", + "gulp-clean-css": "4.3.0", + "gulp-concat": "2.6.1", + "gulp-dart-sass": "1.0.2", + "gulp-plumber": "1.2.1", + "gulp-sourcemaps": "2.6.5", + "gulp-tslint": "8.1.4", + "gulp-typescript": "5.0.1", + "terser-webpack-plugin": "4.2.2", + "ts-loader": "8.0.4", + "tslint": "6.1.3", + "typescript": "4.0.3", + "webpack": "4.44.2", + "webpack-stream": "6.1.0" } } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/update.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/update.nix new file mode 100644 index 000000000000..9faa83c64f9e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/epgstation/update.nix @@ -0,0 +1,66 @@ +{ pname +, version +, homepage +, lib +, common-updater-scripts +, genericUpdater +, writers +, jq +}: + +let + updater = genericUpdater { + inherit pname version; + attrPath = lib.toLower pname; + rev-prefix = "v"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${homepage}"; + }; + updateScript = builtins.elemAt updater 0; + updateArgs = map (lib.escapeShellArg) (builtins.tail updater); +in writers.writeBash "update-epgstation" '' + set -euxo pipefail + + # bump the version + ${updateScript} ${lib.concatStringsSep " " updateArgs} + + cd "${toString ./.}" + + # Get the path to the latest source. Note that we can't just pass the value + # of epgstation.src directly because it'd be evaluated before we can run + # updateScript. + SRC="$(nix-build ../../../.. --no-out-link -A epgstation.src)" + if [[ "${version}" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then + echo "[INFO] Already using the latest version of ${pname}" >&2 + exit + fi + + # Regenerate package.json from the latest source. + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/package.json" \ + > package.json + + # Regenerate node packages to update the pre-overriden epgstation derivation. + # This must come *after* package.json has been regenerated. + pushd ../../../development/node-packages + ./generate.sh + popd + + # Generate default streaming settings for the nixos module. + pushd ../../../../nixos/modules/services/video/epgstation + ${jq}/bin/jq ' + { liveHLS + , liveMP4 + , liveWebM + , mpegTsStreaming + , mpegTsViewer + , recordedDownloader + , recordedStreaming + , recordedHLS + , recordedViewer + }' \ + "$SRC/config/config.sample.json" \ + > streaming.json + popd +'' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix index cdd70b4c8948..e9ae14e19aa2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms"; + sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz"; }; unpackPhase = "tar xvf $src"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r filebot.sh lib/ jar/ $out/opt/ # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. substituteInPlace $out/opt/filebot.sh \ - --replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ + --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' wrapProgram $out/opt/filebot.sh \ --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/gnomecast/default.nix index 3a3ca044bb88..e4814e40c1fd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -3,11 +3,11 @@ with python3Packages; buildPythonApplication rec { pname = "gnomecast"; - version = "1.4.1"; + version = "1.9.11"; src = fetchPypi { inherit pname version; - sha256 = "0mn03gqbwmhch0055bzgdwkzsl304qdyqwrgyiq0k5c5d2gyala5"; + sha256 = "4d8cd7a71f352137252c5a9ee13475bd67fb99594560ecff1efb0f718d8bbaac"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/go-chromecast/default.nix new file mode 100644 index 000000000000..89c2eb425ce6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/go-chromecast/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-chromecast"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "vishen"; + repo = pname; + rev = "v${version}"; + sha256 = "0y1zwy1bxnjz409vdhqwykvfjhrsyy4j503v3rjrrhkcca6vfbyg"; + }; + + vendorSha256 = "04mgm3afgczq0an6ys8bilxv1hgzfwvgjx21fyl82yxd573rsf5r"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + + meta = with lib; { + homepage = "https://github.com/vishen/go-chromecast"; + description = "CLI for Google Chromecast, Home devices and Cast Groups"; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/gpac/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/gpac/default.nix index 4fcff75f0956..aa66155d17ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/gpac/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/gpac/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "11jrklaahhdfqhci7f3lzv8wchh9bc91rg6w8ibh6varrk692vsb"; + sha256 = "0gj46jpprfqv3wyagblv3a52chbplyzhvpra66v63czjibqsslm5"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix index 91feb178ca05..e1631150b8be 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20200521"; + version = "20200907"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; - sha256 = "1r1rwfgi714nwblyg8nqjzkpm4n2lg7kqqqas47hvbn5waimz1ja"; + sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/k9copy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/k9copy/default.nix deleted file mode 100644 index 317505185d0d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/k9copy/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl -, cmake -, dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools -, phonon, qtx11extras -, extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid -}: - -stdenv.mkDerivation rec { - version = "3.0.3"; - pname = "k9copy"; - - src = fetchurl { - url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz"; - sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg"; - }; - - patches = [ - ./gcc6.patch - ]; - - cmakeFlags = [ - "-DQT5_BUILD=ON" - "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0" - ]; - - # Hack to disable documentation - preConfigure = '' - substituteInPlace ./CMakeLists.txt \ - --replace "add_subdirectory(doc)" "" - ''; - - buildInputs = [ - cmake - dvdauthor - xineLib - libmpeg2 - libav - libdvdread - libdvdnav - dvdplusrwtools - #automoc4 - phonon - extra-cmake-modules - kio - solid - qtx11extras - kiconthemes - ki18n - kdesu - ]; - nativeBuildInputs = [ kdoctools ]; - - meta = { - description = "DVD backup and DVD authoring program"; - homepage = "http://k9copy-reloaded.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ flosse ]; - platforms = stdenv.lib.platforms.unix; - # TODO: The software is deprecated and the build is broken, see: - # https://github.com/NixOS/nixpkgs/pull/63260#issuecomment-503506487 - broken = true; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch b/infra/libkookie/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch deleted file mode 100644 index d0c9c2a8035e..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git c/src/backup/k9dvdbackup.cpp i/src/backup/k9dvdbackup.cpp -index f5e4859..82fa392 100755 ---- c/src/backup/k9dvdbackup.cpp -+++ i/src/backup/k9dvdbackup.cpp -@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) { - - - if ((vobu1 !=NULL) && (vobu2!=NULL)) { -- *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; -+ *_offset = (vobu1->newSector - vobu2->newSector) | maskOffset1 ; - *_offset |= maskOffset2; - return vobu2; - } -diff --git c/src/backup/k9execcopy.cpp i/src/backup/k9execcopy.cpp -index d59222c..35de923 100644 ---- c/src/backup/k9execcopy.cpp -+++ i/src/backup/k9execcopy.cpp -@@ -306,7 +306,7 @@ void k9ExecCopy::createMkv(k9DVDTitle *_title,const QString &_filename,QMultiMap - - #if QT_VERSION >= 0x050000 - m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() ); -- m_progressDialog->setCancelButton(false); -+ m_progressDialog->setCancelButton(0); - - #else - m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() ); diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix index 56788ae4f10e..a60250ee0ff1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -3,7 +3,7 @@ , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre +, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless , libxml2, systemd , alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff @@ -45,14 +45,14 @@ assert useWayland -> wayland != null && wayland-protocols != null && waylandpp ! let kodiReleaseDate = "20200728"; - kodiVersion = "18.8"; + kodiVersion = "18.9"; rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "0qpkpz43s207msvv3qkiy6vzqwcgmydxv3py7vc29mv6h30chrva"; + sha256 = "0nnf7823pixj6n2fkjc8rbdjwayvhlbglij2by4rnjzzfgmqmw20"; }; cmakeProto = fetchurl { @@ -211,7 +211,7 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - jre yasm gettext python2Packages.python flatbuffers + jre_headless yasm gettext python2Packages.python flatbuffers # for TexturePacker giflib zlib libpng libjpeg lzo diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix index 0e23eac9a866..6863ef9ca622 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix @@ -481,12 +481,12 @@ let self = rec { plugin = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.3.12"; + version = "2.4.6"; src = fetchFromGitHub { owner = "peak3d"; repo = "inputstream.adaptive"; - rev = version; + rev = "${version}-${rel}"; sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/lightworks/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/lightworks/default.nix index da413915e37e..97e5e67aaec1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/lightworks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/lightworks/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv -, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU +, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let @@ -10,7 +10,7 @@ let cairo libjpeg_original glib - gnome2.pango + pango libGLU nvidia_cg_toolkit zlib diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix index 3a2d1b79e9e0..365fb1ea417a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2 -, gamin, qmake4Hook -}: +{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: -stdenv.mkDerivation rec { - version = "0.8"; +mkDerivation rec { + version = "0.8.5"; pname = "linuxstopmotion"; - + src = fetchgit { - url = "git://git.code.sf.net/p/linuxstopmotion/code"; - rev = "refs/tags/${version}"; - sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6"; + url = "https://git.code.sf.net/p/linuxstopmotion/code"; + rev = version; + sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; - - patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ]; + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ]; - # Installation breaks without this - preInstall = '' - mkdir -p "$out/share/stopmotion/translations/" - cp -v build/*.qm "$out/share/stopmotion/translations/" + postPatch = '' + substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create stop-motion animation movies"; homepage = "http://linuxstopmotion.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch b/infra/libkookie/nixpkgs/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch deleted file mode 100644 index caab48d0e2d9..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b23b7dab1d540b0710fcb9ded1c6256a49844906 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> -Date: Wed, 20 Aug 2014 22:22:00 +0200 -Subject: [PATCH] Fix wrong "isProcess" logic - -Stopmotion wrongly thinks that uvccapture should be run as a daemon, -even though configuration for uvccapture has no "daemon-like" command -line to be run (according to "preferences"). The result is an error -popup instead of video/image grabbing. - -This brings back the "isProcess" logic that was in stopmotion v0.7.2, -because it seems to work, while the current logic (v0.8.0) seems to -fail. ---- - src/presentation/frontends/qtfrontend/frameview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/presentation/frontends/qtfrontend/frameview.cpp b/src/presentation/frontends/qtfrontend/frameview.cpp -index e44dca7..d2c41fd 100644 ---- a/src/presentation/frontends/qtfrontend/frameview.cpp -+++ b/src/presentation/frontends/qtfrontend/frameview.cpp -@@ -270,7 +270,7 @@ bool FrameView::on() { - Preference device(QString("device%1") - .arg(activeDev).toLatin1().constData(), ""); - QString pre = QString(prepoll.get()).replace("$VIDEODEVICE", device.get()); -- bool isProcess = startDaemon.get(); -+ bool isProcess = (strcmp(startDaemon.get(), "") == 0) ? false : true; - - bool isCameraReady = true; - this->grabber = new CommandLineGrabber(capturedFile.path(), isProcess); --- -2.0.2 - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/makemkv/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/makemkv/default.nix index d3cb12924c26..6f47307f4a6a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -1,23 +1,33 @@ -{ stdenv, mkDerivation, fetchurl, autoPatchelfHook -, ffmpeg_3, openssl, qtbase, zlib, pkgconfig +{ stdenv +, mkDerivation +, fetchurl +, autoPatchelfHook +, pkg-config +, ffmpeg_3 +, openssl +, qtbase +, zlib + +, withJava ? true +, jre_headless }: let - version = "1.15.2"; + version = "1.15.3"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "1dbips0qllbwhak44c50nlwn8n3kx8i6773cal5zl3dv4v2nf6ql"; + hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "1wnhzlz5fw6qwh82hjcpimg60xb3a9a54zb6gcjhqr9zdly2zphy"; + hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw="; }; in mkDerivation { pname = "makemkv"; @@ -27,10 +37,17 @@ in mkDerivation { sourceRoot = "makemkv-oss-${version}"; - nativeBuildInputs = [ autoPatchelfHook pkgconfig ]; + nativeBuildInputs = [ autoPatchelfHook pkg-config ]; buildInputs = [ ffmpeg_3 openssl qtbase zlib ]; + qtWrapperArgs = + let + binPath = stdenv.lib.makeBinPath [ jre_headless ]; + in stdenv.lib.optionals withJava [ + ''--prefix PATH : ${binPath}'' + ]; + installPhase = '' runHook preInstall diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix index 9d6ffbd439c4..7320deaf4ce4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix @@ -1,11 +1,13 @@ -{ stdenv +{ stdenv , fetchFromGitHub +, fetchpatch , qttools , qtmultimedia , liblo , gst_all_1 , qmake , pkgconfig +, wrapQtAppsHook }: with stdenv; @@ -25,6 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig + wrapQtAppsHook ]; buildInputs = [ @@ -37,6 +40,14 @@ mkDerivation rec { gst_all_1.gst-vaapi ]; + patches = [ + (fetchpatch { + name = "message-handler-segfault.patch"; + url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch"; + sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l"; + }) + ]; + installPhase = '' mkdir -p $out/bin cp mapmap $out/bin/mapmap @@ -57,8 +68,6 @@ mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; - # binary segfaults at the moment - broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/minitube/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/minitube/default.nix index 690b8355340c..a5bd030e470c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/minitube/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/minitube/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "minitube"; - version = "3.2"; + version = "3.6"; src = fetchFromGitHub { - sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c"; + sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU="; rev = version; repo = "minitube"; owner = "flaviotordini"; fetchSubmodules = true; }; - buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ]; - nativeBuildInputs = [ wrapQtAppsHook qmake ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; + nativeBuildInputs = [ qmake qttools ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Stand-alone YouTube video player"; longDescription = '' Watch YouTube videos in a new way: you type a keyword, Minitube gives diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix index d1efae4a9244..b6856f1a18e3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/jacksonliam/mjpg-streamer"; - description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; + description = "Takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ gebner ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mkclean/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mkclean/default.nix index 6bb1bcc5d8a6..36cd2206070c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mkclean/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mkclean/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed"; + description = "Command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed"; homepage = "https://www.matroska.org"; license = licenses.bsdOriginal; maintainers = with maintainers; [ chrisaw ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index fa68c58f5af1..77bacea2a232 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "50.0.0"; + version = "51.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd"; + sha256 = "06k2slgac0fhgypmdriwdc5s09mry22vxk316ixfj5sv3irwn7wc"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/motion/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/motion/default.nix index 7f101c41edbd..e25101250411 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/motion/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "01yy4pdgd4wa97bpw27zn5zik9iz719m1jiwkk9lb7m2a2951dhc"; + sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mpc-qt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mpc-qt/default.nix index 07b4c79a5b3d..d9de3eb699d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mpc-qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mpc-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtx11extras, qttools, mpv }: +{ stdenv, mkDerivation, fetchFromGitLab, fetchpatch, pkg-config, qmake, qtx11extras, qttools, mpv }: mkDerivation rec { pname = "mpc-qt"; @@ -11,7 +11,14 @@ mkDerivation rec { sha256 = "1cis8dl9pm91mpnp696zvwsfp96gkwr8jgs45anbwd7ldw78w4x5"; }; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + patches = [ + (fetchpatch { + url = "https://gitlab.com/mpc-qt/mpc-qt/-/commit/02f2bc7a22e863a89ba322b9acb61cf1aef23ba0.diff"; + sha256 = "0khld55i194zgi18d0wch5459lfzzkbfdbl1im8akvq8ks5xijis"; + }) + ]; + + nativeBuildInputs = [ pkg-config qmake qttools ]; buildInputs = [ mpv qtx11extras ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mplayer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mplayer/default.nix index f00b5aabf977..86047239cc56 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -21,6 +21,7 @@ , jackaudioSupport ? false, libjack2 ? null , pulseSupport ? config.pulseaudio or false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null +, v4lSupport ? false, libv4l ? null # For screenshots , libpngSupport ? true, libpng ? null , libjpegSupport ? true, libjpeg ? null @@ -53,6 +54,7 @@ assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; assert libjpegSupport -> libjpeg != null; +assert v4lSupport -> libv4l != null; let @@ -132,6 +134,7 @@ stdenv.mkDerivation rec { ++ optional libpngSupport libpng ++ optional libjpegSupport libjpeg ++ optional bs2bSupport libbs2b + ++ optional v4lSupport libv4l ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ]) ; @@ -156,6 +159,7 @@ stdenv.mkDerivation rec { (if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc") (if jackaudioSupport then "" else "--disable-jack") (if pulseSupport then "--enable-pulse" else "--disable-pulse") + (if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2") "--disable-xanim" "--disable-ivtv" "--disable-xvid --disable-xvid-lavc" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/default.nix index 4b7d78303b2f..d7dc865c1694 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch +{ config, stdenv, fetchFromGitHub , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -31,33 +31,29 @@ , mesa ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null +, archiveSupport ? true, libarchive ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , cmsSupport ? true, lcms2 ? null , dvdnavSupport ? stdenv.isLinux, libdvdnav ? null +, jackaudioSupport ? false, libjack2 ? null , libpngSupport ? true, libpng ? null +, openalSupport ? true, openalSoft ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null -# NOTE: samba support should be removed on the next mpv release, see also: -# https://github.com/NixOS/nixpkgs/pull/89145#issuecomment-636424362 -# Please remove this line on the next mpv release. -, sambaSupport ? false, samba ? null , screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null -, sndioSupport ? true, sndio ? null +, sixelSupport ? false, libsixel ? null , speexSupport ? true, speex ? null , swiftSupport ? false, swift ? null , theoraSupport ? true, libtheora ? null , vaapiSupport ? stdenv.isLinux, libva ? null +, vapoursynthSupport ? false, vapoursynth ? null , vdpauSupport ? true, libvdpau ? null , xineramaSupport ? stdenv.isLinux, libXinerama ? null , xvSupport ? stdenv.isLinux, libXv ? null , zimgSupport ? true, zimg ? null -, archiveSupport ? true, libarchive ? null -, jackaudioSupport ? false, libjack2 ? null -, openalSupport ? true, openalSoft ? null -, vapoursynthSupport ? false, vapoursynth ? null }: with stdenv.lib; @@ -80,9 +76,8 @@ assert openalSupport -> available openalSoft; assert pulseSupport -> available libpulseaudio; assert rubberbandSupport -> available rubberband; assert screenSaverSupport -> available libXScrnSaver; -assert sambaSupport -> available samba; assert sdl2Support -> available SDL2; -assert sndioSupport -> available sndio; +assert sixelSupport -> available libsixel; assert speexSupport -> available speex; assert theoraSupport -> available libtheora; assert vaapiSupport -> available libva; @@ -100,13 +95,13 @@ let in stdenv.mkDerivation rec { pname = "mpv"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "0kmy1q0hp87vq4rpv7py04x8bpg1wmlzaibavmkf713jqp6qy596"; + sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk="; }; postPatch = '' @@ -140,9 +135,8 @@ in stdenv.mkDerivation rec { (enableFeature cddaSupport "cdda") (enableFeature dvdnavSupport "dvdnav") (enableFeature openalSupport "openal") - (enableFeature sambaSupport "libsmbclient") (enableFeature sdl2Support "sdl2") - (enableFeature sndioSupport "sndio") + (enableFeature sixelSupport "sixel") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") @@ -168,10 +162,9 @@ in stdenv.mkDerivation rec { ++ optional openalSupport openalSoft ++ optional pulseSupport libpulseaudio ++ optional rubberbandSupport rubberband - ++ optional sambaSupport samba ++ optional screenSaverSupport libXScrnSaver ++ optional sdl2Support SDL2 - ++ optional sndioSupport sndio + ++ optional sixelSupport libsixel ++ optional speexSupport speex ++ optional theoraSupport libtheora ++ optional vaapiSupport libva @@ -196,14 +189,6 @@ in stdenv.mkDerivation rec { python3 TOOLS/osxbundle.py -s build/mpv ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ - # Fix cocoa backend. Remove with the next release - (fetchpatch { - url = "https://github.com/mpv-player/mpv/commit/188169854313b99d01da8f69fe129f0a487eb7c4.patch"; - sha256 = "062sz4666prb2wg1rn5q8brqkzlq6lxn8sxic78a8lb0125c01f7"; - }) - ]; - postInstall = '' # Use a standard font mkdir -p $out/share/mpv diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix index f19db554d045..5f2a21ea7e44 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv }: +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib mpv ]; + buildInputs = [ glib mpv-unwrapped ]; installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/wrapper.nix index 5b3ad7a98311..4d61971956e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mpv/wrapper.nix @@ -37,7 +37,7 @@ let "--prefix" "LUA_CPATH" ";" "${mpv.luaEnv}/lib/lua/${mpv.lua.luaversion}/?.so" "--prefix" "LUA_PATH" ";" "${mpv.luaEnv}/share/lua/${mpv.lua.luaversion}/?.lua" ] ++ lib.optionals mpv.vapoursynthSupport [ - "--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/lib/${mpv.vapoursynth.python3.sitePackages}" + "--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/${mpv.vapoursynth.python3.sitePackages}" ] ++ lib.optionals (binPath != "") [ "--prefix" "PATH" ":" binPath ] ++ (lib.lists.flatten (map diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/default.nix index c8d70c72fbac..cdecde6b869a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -32,6 +32,7 @@ , alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio +, libcef }: let @@ -39,13 +40,14 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "26.0.0"; + version = "26.0.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; - rev = version; - sha256 = "09y57b3c88szl3wyx3cxq8jrm3pfnyg2n25hxl1ynkq3rgaavdq2"; + rev = "refs/tags/${version}"; + sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw"; + fetchSubmodules = true; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; @@ -55,6 +57,7 @@ in mkDerivation rec { fdk_aac ffmpeg jansson + libcef libjack2 libv4l libxkbcommon @@ -73,6 +76,18 @@ in mkDerivation rec { ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; + # Copied from the obs-linuxbrowser + postUnpack = '' + mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ + for i in ${libcef}/share/cef/*; do + cp -r $i cef/Release/ + cp -r $i cef/Resources/ + done + cp -r ${libcef}/lib/libcef.so cef/Release/ + cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ + cp -r ${libcef}/include cef/ + ''; + # obs attempts to dlopen libobs-opengl, it fails unless we make sure # DL_OPENGL is an explicit path. Not sure if there's a better way # to handle this. @@ -80,6 +95,9 @@ in mkDerivation rec { "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" "-DOBS_VERSION_OVERRIDE=${version}" "-Wno-dev" # kill dev warnings that are useless for packaging + # Add support for browser source + "-DBUILD_BROWSER=ON" + "-DCEF_ROOT_DIR=../../cef" ]; postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix deleted file mode 100644 index a33383937fb8..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ /dev/null @@ -1,49 +0,0 @@ -# We don't have a wrapper which can supply obs-studio plugins so you have to -# somewhat manually install this: - -# nix-env -f . -iA obs-linuxbrowser -# mkdir -p ~/.config/obs-studio/plugins -# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/ - -{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }: - -stdenv.mkDerivation rec { - pname = "obs-linuxbrowser"; - version = "0.6.1-6-gf86dba6"; - - src = fetchFromGitHub { - owner = "bazukas"; - repo = "obs-linuxbrowser"; - rev = version; - sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio ]; - postUnpack = '' - mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ - for i in ${libcef}/share/cef/*; do - ln -s $i cef/Release/ - ln -s $i cef/Resources/ - done - ln -s ${libcef}/lib/libcef.so cef/Release/ - ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ - ln -s ${libcef}/include cef/ - ''; - cmakeFlags = [ - "-DCEF_ROOT_DIR=../../cef" - "-DOBS_INCLUDE_SEARCH_DIR=${obs-studio}/include/obs" - ]; - installPhase = '' - mkdir -p $out/share/obs/obs-plugins - cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/ - ''; - - meta = with stdenv.lib; { - description = "Browser source plugin for obs-studio based on Chromium Embedded Framework"; - homepage = "https://github.com/bazukas/obs-linuxbrowser"; - maintainers = with maintainers; [ puffnfresh ]; - license = licenses.gpl2; - platforms = with platforms; linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-move-transition.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-move-transition.nix new file mode 100644 index 000000000000..70985b438c6b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-move-transition.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-move-transition"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-move-transition"; + rev = version; + sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + cmakeFlags = with lib; [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" + "-Wno-dev" + ]; + + preConfigure = '' + cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake + ''; + + patches = [ ./rename-obs-move-transition-cmake.patch ]; + + postPatch = '' + substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' + substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' + substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' + ''; + + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/move-transition/${pluginPath} + ln -s $out/lib/obs-plugins/move-transition.so $out/share/obs/obs-plugins/move-transition/${pluginPath} + ''; + + meta = with lib; { + description = "Plugin for OBS Studio to move source to a new position during scene transition"; + homepage = "https://github.com/exeldro/obs-move-transition"; + maintainers = with maintainers; [ starcraft66 ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix index f22ddd39ee4b..a250a365ac63 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.7.1"; + version = "4.9.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ndi ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "Palakis"; repo = "obs-ndi"; rev = version; - sha256 = "040fkbf3f3qgqcrd3072y3zrjb4fwga8zr10jym744xd7bgyylqh"; + sha256 = "1y3xdqp55jayhg4sinwiwpk194zc4f4jf0abz647x2fprsk9jz7s"; }; patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; - maintainers = with maintainers; [ peti ]; + maintainers = with maintainers; [ peti jshcmpbll ]; license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch new file mode 100644 index 000000000000..24c1848c10ba --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d116619..a1366ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,17 @@ ++if (POLICY CMP0048) ++ cmake_policy(SET CMP0048 NEW) ++endif (POLICY CMP0048) ++ + project(move-transition VERSION 2.0.2) + set(PROJECT_FULL_NAME "Move Transition") + ++include(FindLibobs.cmake) ++find_package(LibObs REQUIRED) ++ ++include_directories( ++ "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions" ++ "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api") ++ + set(move-transition_HEADERS + move-transition.h + easing.h) +@@ -34,4 +45,10 @@ target_link_libraries(move-transition + libobs) + + set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro") +-install_obs_plugin_with_data(move-transition data) ++set_target_properties(move-transition PROPERTIES PREFIX "") ++ ++install(TARGETS move-transition ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins) ++ ++install(DIRECTORY data/locale/ ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/move-transition/locale") diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix index 99486a9ccc0c..14bc80dd3880 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix @@ -7,7 +7,7 @@ # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit { stdenv, fetchhg, wayland, obs-studio , meson, ninja, pkgconfig, libX11 -, dmabufSupport ? false, libdrm ? null, libGL ? null}: +, dmabufSupport ? false, libdrm ? null, libGL ? null, lib}: assert dmabufSupport -> libdrm != null && libGL != null; @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; mesonFlags = [ - "-Duse_dmabuf=${if dmabufSupport then "true" else "false"}" + "-Duse_dmabuf=${lib.boolToString dmabufSupport}" ]; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index cd3176249f8a..9245bdf03e43 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -1,6 +1,7 @@ { stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch , doxygen, python3Packages, libopenshot -, wrapGAppsHook, gtk3 }: +, wrapGAppsHook, gtk3 +, qtsvg }: mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; @@ -29,6 +30,12 @@ mkDerivationWith python3Packages.buildPythonApplication rec { postFixup = '' wrapProgram $out/bin/openshot-qt \ + '' + # Fix toolbar icons on Darwin + + stdenv.lib.optionalString stdenv.isDarwin '' + --suffix QT_PLUGIN_PATH : "${stdenv.lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + '' + + '' "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" ''; @@ -47,6 +54,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + platforms = with platforms; unix; + # Cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index d1a368b43ba2..b6bb87e66512 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib , libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen +, alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor +, zlib, AGL, Cocoa, Foundation +}: with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +19,12 @@ stdenv.mkDerivation rec { [ pkgconfig cmake doxygen ]; buildInputs = - [ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ]; + optionals stdenv.isLinux [ alsaLib ] + ++ (if stdenv.isDarwin then + [ zlib AGL Cocoa Foundation ] + else + [ libX11 libXft libXrandr libXinerama libXext libXcursor ]) + ; doCheck = false; @@ -30,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix index e24b6ee41f85..1b6084a1d2f9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -3,7 +3,9 @@ , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 , unittest-cpp, cppzmq, zeromq -, qtbase, qtmultimedia }: +, qtbase, qtmultimedia +, llvmPackages +}: with stdenv.lib; stdenv.mkDerivation rec { @@ -27,7 +29,9 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagick ffmpeg_3 swig python3 unittest-cpp - cppzmq zeromq qtbase qtmultimedia ]; + cppzmq zeromq qtbase qtmultimedia ] + ++ optional stdenv.isDarwin llvmPackages.openmp + ; LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; @@ -46,6 +50,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix index b1c1dd285e20..7aef0bfd0353 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , fetchurl -, fetchpatch , pkg-config , gettext , itstool @@ -11,6 +10,7 @@ , gst_all_1 , gtk3 , gobject-introspection +, libpeas , librsvg , gnome3 , libnotify @@ -20,40 +20,15 @@ , gsettings-desktop-schemas }: -let - # gst-transcoder was merged with gst-plugins-bad 1.18. - # TODO: switch to that once available. - gst-transcoder = stdenv.mkDerivation rec { - version = "1.14.1"; - pname = "gst-transcoder"; - src = fetchFromGitHub { - owner = "pitivi"; - repo = "gst-transcoder"; - rev = version; - sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f"; - }; - nativeBuildInputs = [ - pkg-config - meson - ninja - gobject-introspection - python3 - ]; - buildInputs = with gst_all_1; [ - gstreamer - gst-plugins-base - ]; - }; - -in python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "0.999"; + version = "2020.09.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb"; + sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; }; patches = [ @@ -61,42 +36,6 @@ in python3Packages.buildPythonApplication rec { # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch - - # Port from intltool to gettext. - # Needed for the following patches to apply. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/89b1053f2516c594f414c5c67c835471bce44b67.patch"; - sha256 = "8yhArzAtZC+WjHftcSDrstBlT8j6WlGHffU9Nj+ny+c="; - excludes = [ "po/POTFILES.in" ]; - }) - - # Complete switching to gst-transcoder in gst-plugins-bad. - # Otherwise there will likely be conflics. - # TODO: Apply this patch once we are using gst-transcoder from gst-plugins-bad. - # (fetchpatch { - # url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch"; - # sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8="; - # }) - - # Generate renderer.so on macOS instead of dylib. - # Needed for the following patch to apply. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/bcacadcafabf8911efb0fddc8d57329237d08cd1.patch"; - sha256 = "2BM5acIwOgdr1L9vhtMMN4trrLuqCg/K6v6ZYtD1Fjw="; - postFetch = '' - sed -i -e "s/1.90.0.1/0.999/g" "$out" - ''; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch"; - sha256 = "6DhqRlxFWFFdLwGoFem+vPt8x7v732KMVjMF9fypMK4="; - postFetch = '' - sed "$out" -i \ - -e "s/1.90.0.1/0.999/g" \ - -e "s/\(-python_dep.*\)/\1\n /" \ - -e "s/-1,9 +1,16/-1,10 +1,17/" - ''; - }) ]; nativeBuildInputs = [ @@ -112,13 +51,13 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 + libpeas librsvg gnome3.gnome-desktop gsound gnome3.adwaita-icon-theme gsettings-desktop-schemas libnotify - gst-transcoder ] ++ (with gst_all_1; [ gstreamer gst-editing-services @@ -127,7 +66,7 @@ in python3Packages.buildPythonApplication rec { gst-plugins-bad gst-plugins-ugly gst-libav - gst-validate + gst-devtools ]); pythonPath = with python3Packages; [ @@ -142,11 +81,14 @@ in python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs ./getenvvar.py - - # fetchpatch does not support renamings - mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in ''; + # Fixes error + # Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg" + # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 + # and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705. + strictDeps = false; + passthru = { updateScript = gnome3.updateScript { packageName = "pitivi"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index d08a4a852428..107fd5f599ab 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -11,14 +11,14 @@ let depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; - version = "2.55.0.1069"; - vsnHash = "2369bed9"; + version = "2.58.0.1076"; + vsnHash = "38e019da"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "1jq4592sgaia0xy2h7n3vh5i7c84sdh4l64fdc774r4i0bmg66qi"; + sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; @@ -41,7 +41,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; - maintainers = with maintainers; [ kylewlacy ]; + maintainers = with maintainers; [ ]; homepage = "https://plex.tv"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix index 26b57532615a..fddbae9375c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix @@ -1,28 +1,28 @@ { fetchurl }: rec { - webClientBuildId = "180-afec74de50e175"; + webClientBuildId = "183-045db5be50e175"; webClientDesktopBuildId = "4.29.2-e50e175"; - webClientTvBuildId = "4.29.3-afec74d"; + webClientTvBuildId = "4.29.6-045db5b"; webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0rabrg3lk9vgpswk8npa54hzqf2v8ghqqnysxpwn12wrp1pc2rr9"; + sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc="; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "02b5yq4yc411qlg2dkw5j9lrr3cn2y4d27sin0skf6qza180473g"; + sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8="; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0l3xv48kr2rx878a40zrgwif2ga2ikv6fdcbq9pylycnmm41pxmh"; + sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4="; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "0wq115y2xrgwqrzr43nhkq8ba237z20yfp426ki2kdypsq8fjqka"; + sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8="; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "1wax1qslm226l2w53m2fnl849jw349qhg3rjghx7vip5pmb43vw9"; + sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g="; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index 16e6cd826ec8..e25c101b5dfb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "0fi0glnl7nr6754r9jk7d7dsnjbdm7civvhcj2l009yxiv2rxzj3"; + sha256 = "06i6pp4jg0f9h6ash60fj1l5mbsdw3zyx7c6anbsrn86802i7paa"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/qmplay2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/qmplay2/default.nix new file mode 100644 index 000000000000..b7f7f8c53023 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/qmplay2/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, cmake +, alsaLib +, ffmpeg +, libass +, libcddb +, libcdio +, libgme +, libpulseaudio +, libsidplayfp +, libva +, libXv +, taglib +, qtbase +, qttools +, vulkan-headers +, vulkan-tools +, wrapQtAppsHook +}: + +let + pname = "qmplay2"; + version = "20.07.04"; +in stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "zaps166"; + repo = "QMPlay2"; + rev = version; + sha256 = "sha256-sUDucxSvsdD2C2FSVrrXeHdNdrjECtJSXVr106OdHzA="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ + alsaLib + ffmpeg + libass + libcddb + libcdio + libgme + libpulseaudio + libsidplayfp + libva + libXv + qtbase + qttools + taglib + vulkan-headers + vulkan-tools + ]; + + postInstall = '' + # Because we think it is better to use only lowercase letters! + ln -s $out/bin/QMPlay2 $out/bin/qmplay2 + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/zaps166/QMPlay2/"; + description = "Qt-based Multimedia player"; + longDescription = '' + QMPlay2 is a video and audio player. It can play all formats supported by + FFmpeg, libmodplug (including J2B and SFX). It also supports Audio CD, raw + files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3 + browser. + ''; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/shotcut/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/shotcut/default.nix index f1d77fb7d147..1b3ca2850482 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -1,36 +1,64 @@ -{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt -, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater +{ stdenv +, fetchFromGitHub +, fetchpatch +, mkDerivation +, SDL2 +, frei0r +, ladspaPlugins +, gettext +, mlt +, jack1 +, pkgconfig +, qtbase +, qtmultimedia +, qtx11extras +, qtwebsockets +, qtquickcontrols2 +, qtgraphicaleffects +, qmake +, qttools +, genericUpdater , common-updater-scripts }: -assert stdenv.lib.versionAtLeast libmlt.version "6.22.1"; assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.09.13"; + version = "20.11.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21"; + sha256 = "1yr71ihml9wnm7y5pv0gz41l1k6ybd16dk78zxf96kn9b838mzhq"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - SDL2 frei0r gettext mlt libmlt - qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols + SDL2 + frei0r + ladspaPlugins + gettext + mlt + qtbase + qtmultimedia + qtx11extras + qtwebsockets + qtquickcontrols2 qtgraphicaleffects ]; - NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; - qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; + NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; + qmakeFlags = [ + "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "SHOTCUT_VERSION=${version}" + "DEFINES+=SHOTCUT_NOUPGRADE" + ]; prePatch = '' - sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp + sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp NICE=$(type -P nice) @@ -39,9 +67,10 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}" + "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}" "--prefix PATH : ${mlt}/bin" - ]; + ]; postInstall = '' mkdir -p $out/share/shotcut diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 251f495b7e15..1c955a36f34a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -1,6 +1,6 @@ { autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook , at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped -, gdk-pixbuf, glib, gnome2, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg +, gdk-pixbuf, glib, pango, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg , streamlink }: let @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gcc-unwrapped gdk-pixbuf glib - gnome2.pango + pango gtk3-x11 nss nspr diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/vcs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/vcs/default.nix index 0cbdeaaf6ff8..0280cfb3f1f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/vcs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/vcs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper -, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux +, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, util-linux , dejavu_fonts }: with stdenv.lib; let version = "1.13.4"; - runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ]; + runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer util-linux ]; in stdenv.mkDerivation { pname = "vcs"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/vdr/plugins.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/vdr/plugins.nix index 30cd93178c25..e72de8e61f20 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/vdr/plugins.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/vdr/plugins.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 -, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses +, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { @@ -146,7 +146,7 @@ in { nativeBuildInputs = [ perl # for pod2man and pos2html - utillinux + util-linux groff ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/webcamoid/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/webcamoid/default.nix index aa559215fe89..a0d25f2ec1ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/webcamoid/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/webcamoid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: @@ -29,7 +29,7 @@ mkDerivation rec { "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Webcam Capture Software"; longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; homepage = "https://github.com/webcamoid/webcamoid/"; |