diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
commit | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (patch) | |
tree | 3fdd8ed1c086fb0ddf93941114bb1cbbb4659af9 /pkgs/applications/video/handbrake/default.nix | |
parent | e7cccdbb139ccf2f9f170500f40c04a6237a2da1 (diff) | |
parent | ed54a5b51dc9542df94f70b25a13d86d1f494e64 (diff) | |
download | nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.gz nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.bz2 nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.lz nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.xz nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.zst nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.zip |
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
Diffstat (limited to 'pkgs/applications/video/handbrake/default.nix')
-rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index aa2407134f38..a15a4cd5999a 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { and containers. Very versatile and customizable. Package provides: CLI - `HandbrakeCLI` - GTK+ GUI - `ghb` + GTK GUI - `ghb` ''; license = licenses.gpl2; maintainers = with maintainers; [ Anton-Latukha wmertens ]; |