git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #57166 from ar1a/capture-license

capture: 1.0 -> 2019-03-10

commit5511fd131827e90aae761091b4e3063af835cd45 authorRyan Mulligan <ryan@ryantm.com> dateSat 9 Mar 2019, 15:33 (8 years ago) parent0ad6a984263152
3 files changed+5−38
pkgs/tools/misc/capture/0001-eval-fix.patch−10 pkgs/tools/misc/capture/0002-sane-defaults.patch−22 pkgs/tools/misc/capture/default.nix+5−6
pkgs/tools/misc/capture/0001-eval-fix.patchdeleted−10
@@ -1,10 +0,0 @@
1−diff --git a/src/capture.sh b/src/capture.sh
2−index a32b018..82d1f15 100755
3−--- a/src/capture.sh
4−+++ b/src/capture.sh
5−@@ -103,4 +103,4 @@ capture () {
6−
7−
8− # remove this line if you want to source this file instead
9−-eval " ${0##*/}" "$@"
10−+capture "$@"
pkgs/tools/misc/capture/0002-sane-defaults.patchdeleted−22
@@ -1,22 +0,0 @@
1−diff --git a/src/capture.sh b/src/capture.sh
2−index a32b018..42f3936 100755
3−--- a/src/capture.sh
4−+++ b/src/capture.sh
5−@@ -9,7 +9,7 @@ set -e
6− #
7−
8− scale="-1:-1"
9−-fps="15"
10−+fps="30"
11− raw_video="-vf fps=$fps -c:v utvideo -f nut"
12− raw_video_container=".nut"
13−
14−@@ -18,7 +18,7 @@ raw_video_container=".nut"
15− # https://stackoverflow.com/questions/41372045/vp9-encoding-limited-to-4-threads
16− webm_video="-pix_fmt yuv420p -c:v libvpx-vp9 -crf 25 -b:v 0 -f webm -tile-columns 6 -frame-parallel 1 -threads 8"
17−
18−-tmpdir="/var/tmp"
19−+tmpdir="/tmp"
20−
21−
22− # capture_raw ./foo.nut
pkgs/tools/misc/capture/default.nix+5−6
@@ -1,20 +1,18 @@
11{ stdenv, pkgs, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
22
33stdenv.mkDerivation rec {
4− name = "capture-${version}";
5− version = "1.0";
4+ name = "capture-unstable-${version}";
5+ version = "2019-03-10";
66
77 src = fetchFromGitHub {
88 owner = "buhman";
99 repo = "capture";
10− rev = "4be986f17462b8d520559429c74da6bf3a436259";
11− sha256 = "172y06vs993x5v78zwl81xma1gkvjq1ad9rvmf3a217fyxsz4nhh";
10+ rev = "80dd9e7195aad5c132badef610f19509f3935b24";
11+ sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6";
1212 };
1313
1414 buildInputs = [ makeWrapper ];
1515
16− patches = [ ./0001-eval-fix.patch ./0002-sane-defaults.patch ];
17−
1816 installPhase = ''
1917 install -Dm755 src/capture.sh $out/bin/capture
2018
@@ -27,5 +25,6 @@ stdenv.mkDerivation rec {
2725 description = "A no bullshit screen capture tool";
2826 homepage = "https://github.com/buhman/capture";
2927 maintainers = [ maintainers.ar1a ];
28+ license = licenses.gpl3Plus;
3029 };
3130}