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: 8d8532cd32d0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e49ba890c228
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 24, 2020

  1. shotcut: fix melt path 

    closes #104666
    @woffs
    woffs committed Nov 24, 2020
    Copy the full SHA
    a21a641 View commit details

  2. Merge pull request #104677 from woffs/fix-104666 

    shotcut: fix melt path
    @peti
    peti authored Nov 24, 2020
    Copy the full SHA
    e49ba89 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/video/shotcut/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/video/shotcut/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ mkDerivation rec {
];

prePatch = ''
sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
NICE=$(type -P nice)