about summary refs log tree commit diff
path: root/pkgs/applications/video/openshot-qt
diff options
context:
space:
mode:
authorBastian Köcher <git@kchr.de>2017-08-29 12:30:47 +0200
committerBastian Köcher <git@kchr.de>2017-08-29 12:30:47 +0200
commitf5f0d8389015fe93d376a0cfbd1c6344ea04b33e (patch)
tree59f105569a6d96fe79f5f7f8689c4342751fa931 /pkgs/applications/video/openshot-qt
parent75f86ae83114e37229cf9cd84118f811ff4f1115 (diff)
downloadnixlib-f5f0d8389015fe93d376a0cfbd1c6344ea04b33e.tar
nixlib-f5f0d8389015fe93d376a0cfbd1c6344ea04b33e.tar.gz
nixlib-f5f0d8389015fe93d376a0cfbd1c6344ea04b33e.tar.bz2
nixlib-f5f0d8389015fe93d376a0cfbd1c6344ea04b33e.tar.lz
nixlib-f5f0d8389015fe93d376a0cfbd1c6344ea04b33e.tar.xz
nixlib-f5f0d8389015fe93d376a0cfbd1c6344ea04b33e.tar.zst
nixlib-f5f0d8389015fe93d376a0cfbd1c6344ea04b33e.zip
libopenshot: 0.1.4 -> 0.1.7
Removes ruby to fix compilation errors.
Diffstat (limited to 'pkgs/applications/video/openshot-qt')
-rw-r--r--pkgs/applications/video/openshot-qt/libopenshot.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index b45460c426cc..02a19c935e73 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,34 +1,32 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , pkgconfig, cmake, doxygen
 , libopenshot-audio, imagemagick, ffmpeg
-, swig, python3, ruby
+, swig, python3
 , unittest-cpp, cppzmq, czmqpp
 , qtbase, qtmultimedia }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.1.4";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6";
+    sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp";
   };
 
   patchPhase = ''
     sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt
     sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt
-    sed -i 's/{RUBY_VENDOR_ARCH_DIR}/ENV{RUBY_VENDOR_ARCH_DIR}/g' src/bindings/ruby/CMakeLists.txt
     export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)
-    export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages
   '';
 
   nativeBuildInputs = [ pkgconfig cmake doxygen ];
 
   buildInputs =
-  [ imagemagick ffmpeg swig python3 ruby unittest-cpp
+  [ imagemagick ffmpeg swig python3 unittest-cpp
     cppzmq czmqpp qtbase qtmultimedia ];
 
   LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}";
@@ -36,6 +34,8 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
+  cmakeFlags = [ "-DENABLE_RUBY=OFF" ];
+
   meta = {
     homepage = http://openshot.org/;
     description = "Free, open-source video editor library";