Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d8363e7215b4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f92e3b3276c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 24, 2020

  1. 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

(cherry picked from commit 83c847c)
    @CertainLach @rnhmjoj
    CertainLach authored and rnhmjoj committed Nov 24, 2020
    Copy the full SHA
    6f92e3b View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/video/mpv/wrapper.nix
2 changes: 1 addition & 1 deletion pkgs/applications/video/mpv/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ let
"--prefix" "LUA_CPATH" ";" "${mpv.luaEnv}/lib/lua/${mpv.lua.luaversion}/?.so"
"--prefix" "LUA_PATH" ";" "${mpv.luaEnv}/share/lua/${mpv.lua.luaversion}/?.lua"
] ++ lib.optionals mpv.vapoursynthSupport [
"--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/lib/${mpv.vapoursynth.python3.sitePackages}"
"--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/${mpv.vapoursynth.python3.sitePackages}"
] ++ lib.optionals (binPath != "") [
"--prefix" "PATH" ":" binPath
] ++ (lib.lists.flatten (map