nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-12 23:23:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #308292: mpvScripts scopewide fixups

Browse Source
This commit is contained in:
nicoo 2024-05-03 11:36:24 +00:00 committed by GitHub
commit f950274df7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/video/mpv/scripts/convert.nix
View File

@ -22,14 +22,14 @@ buildLua {
postPatch = ''
substituteInPlace convert_script.lua \
--replace 'mkvpropedit_exe = "mkvpropedit"' \
'mkvpropedit_exe = "${mkvtoolnix-cli}/bin/mkvpropedit"' \
--replace 'mkvmerge_exe = "mkvmerge"' \
'mkvmerge_exe = "${mkvtoolnix-cli}/bin/mkvmerge"' \
--replace 'yad_exe = "yad"' \
'yad_exe = "${yad}/bin/yad"' \
--replace 'notify_send_exe = "notify-send"' \
'notify_send_exe = "${libnotify}/bin/notify-send"' \
--replace-fail 'mkvpropedit_exe = "mkvpropedit"' \
'mkvpropedit_exe = "${lib.getExe' mkvtoolnix-cli "mkvpropedit"}"' \
--replace-fail 'mkvmerge_exe = "mkvmerge"' \
'mkvmerge_exe = "${lib.getExe' mkvtoolnix-cli "mkvmerge"}"' \
--replace-fail 'yad_exe = "yad"' \
'yad_exe = "${lib.getExe yad}"' \
--replace-fail 'notify_send_exe = "notify-send"' \
'notify_send_exe = "${lib.getExe libnotify}"' \
'';
scriptPath = "convert_script.lua";

4
pkgs/applications/video/mpv/scripts/cutter.nix
View File

@ -16,13 +16,13 @@ buildLua {
postPatch = ''
substituteInPlace cutter.lua \
--replace '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh'
--replace-fail '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh'
# needs to be ran separately so that we can replace everything, and not every single mention explicitly
# original script places them in the scripts folder, just spawning unnecessary errors
# i know that hardcoding .config and especially the .mpv directory isn't best practice, but I didn't want to deviate too much from upstream
substituteInPlace cutter.lua \
--replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter"
--replace-fail '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter"
'';
passthru.scriptName = "cutter.lua";

2
pkgs/applications/video/mpv/scripts/mpris.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib mpv-unwrapped ffmpeg ];
postPatch = ''
substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?='
substituteInPlace Makefile --replace-fail 'PKG_CONFIG =' 'PKG_CONFIG ?='
'';
installFlags = [ "SCRIPTS_DIR=${placeholder "out"}/share/mpv/scripts" ];

4
pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
View File

@ -14,8 +14,8 @@ buildLua rec {
postPatch = ''
substituteInPlace playlistmanager.lua \
--replace 'youtube_dl_executable = "youtube-dl",' \
'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"',
--replace-fail 'youtube_dl_executable = "yt-dlp",' \
'youtube_dl_executable = "${lib.getExe yt-dlp}"',
'';
meta = with lib; {

8
pkgs/applications/video/mpv/scripts/mpvacious.nix
View File

@ -23,11 +23,11 @@ buildLua rec {
postPatch = ''
substituteInPlace utils/forvo.lua \
--replace "'curl" "'${curl}/bin/curl"
--replace-fail "'curl" "'${lib.getExe curl}"
substituteInPlace platform/nix.lua \
--replace "'curl" "'${curl}/bin/curl" \
--replace "'wl-copy" "'${wl-clipboard}/bin/wl-copy" \
--replace "'xclip" "'${xclip}/bin/xclip"
--replace-fail "'curl" "'${lib.getExe curl}" \
--replace-fail "'wl-copy" "'${lib.getExe' wl-clipboard "wl-copy"}" \
--replace-fail "'xclip" "'${lib.getExe xclip}"
'';
installPhase = ''

4
pkgs/applications/video/mpv/scripts/sponsorblock.nix
View File

@ -28,8 +28,8 @@ buildLua {
postPatch = ''
substituteInPlace sponsorblock.lua \
--replace "python3" "${python3}/bin/python3" \
--replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\""
--replace-fail "python3" "${lib.getExe python3}" \
--replace-fail 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\""
'';
extraScripts = [ "sponsorblock_shared" ];

2
pkgs/applications/video/mpv/scripts/thumbfast.nix
View File

@ -13,7 +13,7 @@ buildLua {
passthru.updateScript = unstableGitUpdater {};
passthru.extraWrapperArgs = [
"--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin"
"--prefix" "PATH" ":" (lib.makeBinPath [ mpv-unwrapped ])
];
meta = {

2
pkgs/applications/video/mpv/scripts/vr-reversal.nix
View File

@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
# reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8
postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") ''
substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":"
substituteInPlace 360plugin.lua --replace-fail ":reset_rot=1:" ":"
'';
installPhase = ''

4
pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
View File

@ -15,9 +15,9 @@ buildNpmPackage rec {
};
postPatch = ''
substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'"
substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs}'"
# This executable is just for telling non-Nix users how to install
substituteInPlace package.json --replace '"bin": "build/bin.mjs",' ""
substituteInPlace package.json --replace-fail '"bin": "build/bin.mjs",' ""
rm -rf src/bin.ts
'';

2
pkgs/applications/video/mpv/scripts/youtube-upnext.nix
View File

@ -13,7 +13,7 @@ buildLua rec {
postPatch = ''
substituteInPlace youtube-upnext.lua \
--replace '"curl"' '"${lib.getExe curl}"'
--replace-fail '"curl"' '"${lib.getExe curl}"'
'';
passthru.updateScript = unstableGitUpdater { };

1
pkgs/tools/misc/yad/default.nix
View File

@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3;
mainProgram = "yad";
maintainers = with maintainers; [ smironov ];
platforms = with platforms; linux;
};