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: 9708378251ee
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 82b699861c27
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 1, 2019

  1. vapoursynth-editor: use qt's mkDerivation 

    (cherry picked from commit d183f71)
    @tadeokondrak @worldofpeace
    tadeokondrak authored and worldofpeace committed Nov 1, 2019
    Copy the full SHA
    82b6998 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/development/libraries/vapoursynth/editor.nix
12 changes: 7 additions & 5 deletions pkgs/development/libraries/vapoursynth/editor.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenv, fetchFromBitbucket, makeWrapper
{ stdenv, mkDerivation, fetchFromBitbucket
, python3, vapoursynth
, qmake, qtbase, qtwebsockets
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "vapoursynth-editor";
version = "R19";

@@ -14,18 +14,20 @@ stdenv.mkDerivation rec {
sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
};

nativeBuildInputs = [ qmake makeWrapper ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase vapoursynth qtwebsockets ];

dontWrapQtApps = true;

preConfigure = "cd pro";

installPhase = ''
preFixup = ''
cd ../build/release*
mkdir -p $out/bin
for bin in vsedit{,-job-server{,-watcher}}; do
mv $bin $out/bin
wrapProgram $out/bin/$bin \
wrapQtApp $out/bin/$bin \
--prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} \
--prefix LD_LIBRARY_PATH : ${vapoursynth}/lib
done