diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/development/libraries/vapoursynth | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vapoursynth')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/vapoursynth/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 0d96829b6baf..0cdbe396a109 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R47.2"; + version = "R48"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "004h0vvih7dlhkcz6l2786pf7s04qhiv0bii4gjx23cxyklglh9i"; + sha256 = "1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ]; diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix index 3853718c1541..196c700af17a 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix @@ -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 |