3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

144 commits

Author SHA1 Message Date
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Michael Weiss 7d8351f4d7
libplacebo: 2.72.2 -> 3.104.0 2021-01-09 17:56:35 +01:00
con-f-use 1596ce4859 mpv: umpv desktop file 2020-12-08 01:30:12 +01:00
Sandro 978f5704ff
Merge pull request #100779 from lukebfox/patch-1
mpvScripts.mpris: fix build
2020-11-27 13:19:07 +01:00
Nicolas Berbiche 9c2351cf27
mpv: enable sixel support 2020-11-25 14:06:16 -05:00
Mario Rodas 7a4b5238eb mpv: fix build on darwin 2020-11-24 04:20:00 +00:00
Anderson Torres f30a8774d9
Merge pull request #104716 from Ma27/bump-mpv
mpv: 0.32.0 -> 0.33.0
2020-11-24 12:59:30 -03:00
Yaroslav Bolyukin 83c847c0c8
mpv: fix vapoursynth path
`mpv.vapoursynth.python3.sitePackages` expands to `/lib/python3.8/site-packages`, thus `/lib/lib/python3.8/site-packages` being produced in wrapper, which is wrong
2020-11-24 12:12:08 +05:00
Maximilian Bosch d1487097ef
mpv: 0.32.0 -> 0.33.0
https://github.com/mpv-player/mpv/releases/tag/v0.33.0
2020-11-23 23:54:46 +01:00
Luke Bentley-Fox 39e33a47b3
mpvScripts.mpris: Use mpv-unwrapped
Needed after #88620 to fix evaluation in some cases. Fixes #100771
2020-10-17 14:46:58 +01:00
José Romildo Malaquias 1d8fae0b4d mpv: install mpv_identify.sh
It is file identification script.
It is used in mc default actions for video files.
2020-09-21 23:29:09 -03:00
Doron Behar a9639b4cbf
Merge pull request #87981 from dawidsowa/master 2020-09-11 15:37:23 +03:00
dawidsowa 59e1c16030 mpvScripts.autoload: init at 2019-02-15 2020-09-11 12:59:17 +02:00
pacien 1d18e35023 mpvScripts.sponsorblock: init at f71e49e (2020-07-05) 2020-08-07 14:47:12 +02:00
zowoq 78e324d272 treewide: ffmpeg_4 -> ffmpeg 2020-06-16 18:23:14 -07:00
Maximilian Bosch 0a63b5ae34
Merge pull request #89262 from cript0nauta/simple-mpv-ui
mpvScripts.simple-mpv-webui: init at 1.0.0
2020-06-17 03:13:48 +02:00
Robert Schütz 4da94b5270 mpv: fix umpv 2020-06-16 01:35:30 +02:00
Doron Behar d60b5aaa2f wrapMpv: Use lib.strings.escapeShellArgs
Instead of manually quoting the strings, use the library function to do
it more reliably.
2020-06-11 17:18:23 +02:00
Matías Lang 5930a0ea44 mpvScripts.simple-mpv-webui: init at 1.0.0 2020-06-06 14:46:15 -03:00
Matías Lang 164985ab68 mpv: disable samba support by default
samba support will be dropped in mpv upstream in its next release (see
3b8b7cb9d4).
Also, using it triggered segmentation faults when using luasocket.

Closes #88584
2020-05-31 16:45:01 -03:00
Doron Behar f93918bdc3 mpv: Move all wrappings to a single wrapper Nix function
Inspired by `wrapNeovim`, write a wrapMpv Nix function that creates a
derivation that has all of the environment that was added if needed at
the unwrapped version.

Add derivations to all-packages.nix in an almost compatible way and make
`mpv-with-scripts` throw a message implying to switch to `wrapMpv` which
has an incompatible signature.

Add to vapoursynth a new passthru attribute `python3` that is used in
passed down to the wrapper to ensure ABI compatibility with
`PYTHONPATH`.
2020-05-24 01:25:33 +03:00
Matías Lang a6dfaad922 mpv: fix lua path
mpv uses lua without directly executing the "lua" binary, so prefixing
$PATH wasn't enough. Without this change, lua scripts were unable to
import luasocket.
2020-05-19 00:50:24 -03:00
Doron Behar b0ac6a009b mpvScripts.mpris: use patch sent upstream for make DESTDIR=
Make sure mpris.so is stripped.
mpv-with-scripts: use a standard location for scripts in $out.
mpvScripts.convert: install to the new location of mpv scripts.
Replaced gobject-introspection dependency with glib.
2020-05-06 10:30:20 +03:00
Doron Behar f388ca8ac8 mpvScripts.mpris: set platforms to Linux 2020-05-04 10:12:53 +03:00
Doron Behar a60552ad94 mpvScripts.mpris: 0.4 -> 0.5 2020-05-03 21:18:46 +03:00
adisbladis 44c30f46f1
mpv: Enable archive support by default 2020-04-14 09:06:09 +01:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jörg Thalheim b114def89c
Merge pull request #79751 from doronbehar/update-mpv-mpris
mpvScripts.mpris: 0.3 -> 0.4
2020-03-31 11:53:53 +01:00
Mario Rodas 9fa6557a71
mpv: fix cocoa backend 2020-03-26 04:20:00 -05:00
Doron Behar fe560588a5 mpvScripts.mpris: 0.3 -> 0.4
Quote URL as well.
2020-02-10 19:55:23 +02:00
Daiderd Jordan 408f36923d
mpv: call with frameworks
Referencing darwin.* directly makes overriding dependencies very
awkward.
2020-02-07 22:09:23 +01:00
Daiderd Jordan 3987ea9a9d
mpv: add flag for swift on darwin
While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.

    self: super:
    let
      CommandLineTools = "/Library/Developer/CommandLineTools";
    in
    {
      swift = super.stdenv.mkDerivation {
        name = "swift-CommandLineTools-0.0.0";
        phases = [ "installPhase" "fixupPhase" ];

        propagatedBuildInputs = [ self.darwin.DarwinTools ];

        installPhase = ''
            mkdir -p $out/bin $out/lib
            ln -s ${CommandLineTools}/usr/bin/swift $out/bin
            ln -s ${CommandLineTools}/usr/lib/swift $out/lib
            ln -s ${CommandLineTools}/SDKs $out
        '';

        setupHook = builtins.toFile "hook" ''
            addCommandLineTools() {
                echo >&2
                echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
                echo "  $ xcode-select --install" >&2
                echo >&2
                [ -d ${CommandLineTools} ]
                export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
                export SWIFT=swift
                export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
                export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
                export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
            }

            prePhases+=" addCommandLineTools"
        '';

        __impureHostDeps = [ CommandLineTools ];
      };

      mpv = super.mpv.override { swiftSupport = true; };
    }
2020-02-06 14:15:35 +01:00
Benjamin Hipple 542d758956 mpv: use waf from distribution and wafHook helper
This cleans up our dependency footprint by ensuring a consistent version, and
also avoids duplicating the logic for how to build a waf package by deferring to
the `wafHook` helper for the `configurePhase`, `buildPhase`, and `installPhase`.
2020-02-02 14:11:49 -05:00
Maximilian Bosch 499af6321f
mpv: 0.31.0 -> 0.32.0
https://github.com/mpv-player/mpv/releases/tag/v0.32.0
2020-01-26 22:32:13 +01:00
Ivan Kozik 76ab11518d treewide: Remove myself from maintainers on some packages (#78027) 2020-01-19 12:18:34 -05:00
Doron Behar b763746404 mpvScripts.mpris: 0.2 -> 0.3 2019-12-31 15:08:05 +02:00
Tadeo Kondrak 85783b9eac
mpv: 0.30.0 -> 0.31.0 2019-12-28 09:10:30 -07:00
Maximilian Bosch 9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Mateusz Kowalczyk 1451a52a38 Remove myself (fuuzetsu) from maintainer lists
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
2019-12-05 16:29:48 +09:00
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Mario Rodas 3510e233dc
mpv: disable samba support on darwin 2019-11-13 22:57:29 -05:00
Jan Malakhovski 4d680f3f3d mpv: enable openal support by default
See the previous commit.
2019-10-29 17:38:07 +01:00
Tadeo Kondrak b2256035a5
mpv: 0.29.1 -> 0.30.0 2019-10-25 09:54:46 -06:00
Ivan Kozik 46cbb8453a mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
This fixes #67780.

Currently, using `mpv --hwdec=nvdec --msg-level=vd=debug` on NVIDIA results in:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
Cannot load libcuda.so.1
[vd] Could not create device.
[vd] No hardware decoding available for this codec.
```

With just mpv patched, ffmpeg cannot load libnvcuvid.so.1:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
[ffmpeg/video] hevc: Cannot load libnvcuvid.so.1
[ffmpeg/video] hevc: Failed loading nvcuvid.
[ffmpeg/video] hevc: Failed setup for format cuda: hwaccel initialisation returned error.
```

With both mpv and ffmpeg patched, it works:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
Using hardware decoding (nvdec).
[vd] Decoder format: 3840x2160 cuda[p010] bt.2020-ncl/bt.2020/pq/limited/auto SP=10.000000 CL=unknown (auto 0.000000/0.000000/0.000000)
```
2019-09-06 23:18:26 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Mario Rodas 20eda8246c
mpv: fix darwin build 2019-05-06 23:57:10 -05:00
Silvan Mosberger a8e19088da
Merge pull request #54392 from ivan/nv-codec
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
2019-03-29 19:57:13 +01:00
Ivan Kozik de8f760fbd ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
NVIDIA users can now use `mpv --hwdec=nvdec` to play videos that the
software decoders cannot keep up with.
2019-02-11 00:32:43 +00:00