diff --git a/pkgs/tools/misc/capture/0001-eval-fix.patch b/pkgs/tools/misc/capture/0001-eval-fix.patch deleted file mode 100644 index 4b5bdc6a0bcf..000000000000 --- a/pkgs/tools/misc/capture/0001-eval-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/capture.sh b/src/capture.sh -index a32b018..82d1f15 100755 ---- a/src/capture.sh -+++ b/src/capture.sh -@@ -103,4 +103,4 @@ capture () { - - - # remove this line if you want to source this file instead --eval " ${0##*/}" "$@" -+capture "$@" diff --git a/pkgs/tools/misc/capture/0002-sane-defaults.patch b/pkgs/tools/misc/capture/0002-sane-defaults.patch deleted file mode 100644 index 1bd49ae41e38..000000000000 --- a/pkgs/tools/misc/capture/0002-sane-defaults.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/capture.sh b/src/capture.sh -index a32b018..42f3936 100755 ---- a/src/capture.sh -+++ b/src/capture.sh -@@ -9,7 +9,7 @@ set -e - # - - scale="-1:-1" --fps="15" -+fps="30" - raw_video="-vf fps=$fps -c:v utvideo -f nut" - raw_video_container=".nut" - -@@ -18,7 +18,7 @@ raw_video_container=".nut" - # https://stackoverflow.com/questions/41372045/vp9-encoding-limited-to-4-threads - webm_video="-pix_fmt yuv420p -c:v libvpx-vp9 -crf 25 -b:v 0 -f webm -tile-columns 6 -frame-parallel 1 -threads 8" - --tmpdir="/var/tmp" -+tmpdir="/tmp" - - - # capture_raw ./foo.nut diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index 49c238b0bd0f..b78f1d7136d3 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,20 +1,18 @@ { stdenv, pkgs, slop, ffmpeg, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { - name = "capture-${version}"; - version = "1.0"; + name = "capture-unstable-${version}"; + version = "2019-03-10"; src = fetchFromGitHub { owner = "buhman"; repo = "capture"; - rev = "4be986f17462b8d520559429c74da6bf3a436259"; - sha256 = "172y06vs993x5v78zwl81xma1gkvjq1ad9rvmf3a217fyxsz4nhh"; + rev = "80dd9e7195aad5c132badef610f19509f3935b24"; + sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6"; }; buildInputs = [ makeWrapper ]; - patches = [ ./0001-eval-fix.patch ./0002-sane-defaults.patch ]; - installPhase = '' install -Dm755 src/capture.sh $out/bin/capture @@ -27,5 +25,6 @@ stdenv.mkDerivation rec { description = "A no bullshit screen capture tool"; homepage = "https://github.com/buhman/capture"; maintainers = [ maintainers.ar1a ]; + license = licenses.gpl3Plus; }; }