about summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-14 15:24:37 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-21 15:49:54 -0400
commited14223f8c30c014190e87914126578babd94c3e (patch)
treea0cf6d519d4d4d8507b204076ae5b0dad40f0d18 /pkgs/applications/video
parent7a733ceda45d9e7842685523cfebeee07aaa3f97 (diff)
treewide: Manual fix more pkg-config build-inputs
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/natron/default.nix16
-rw-r--r--pkgs/applications/video/simplescreenrecorder/default.nix5
-rw-r--r--pkgs/applications/video/xvidcap/default.nix4
3 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 75dccbafd3f47..e2f5d4ba598d7 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -20,14 +20,14 @@ let
     nativeBuildInputs = [ cmake ];
     buildInputs = [ libpng flex bison ];
   };
-  buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }:
+  buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "" }:
     stdenv.mkDerivation {
       name = "openfx-${pluginName}-${version}";
       src = fetchurl {
         url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz";
         inherit sha256;
       };
-      inherit buildInputs;
+      inherit nativeBuildInputs buildInputs;
       preConfigure = ''
         makeFlagsArray+=("CONFIG=release")
         makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
@@ -50,8 +50,9 @@ let
     ({
       pluginName = "arena";
       sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf";
+      nativeBuildInputs = [ pkgconfig ];
       buildInputs = [
-        pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip
+        pango librsvg librevenge libcdr opencolorio libxml2 libzip
         poppler imagemagick
       ];
       preConfigure = ''
@@ -65,8 +66,9 @@ let
     ({
       pluginName = "io";
       sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
+      nativeBuildInputs = [ pkgconfig ];
       buildInputs = [
-        pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
+        libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
         seexpr
       ];
     })
@@ -91,12 +93,12 @@ stdenv.mkDerivation {
     sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp";
   };
 
+  nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ];
+
   buildInputs = [
-    pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
+    qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
   ];
 
-  nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ];
-
   preConfigure = ''
     export MAKEFLAGS=-j$NIX_BUILD_CORES
     cp ${./config.pri} config.pri
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 571f46de38546..447518d008b41 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -24,8 +24,9 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  buildInputs = [
-    alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [  
+    alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa
     libpulseaudio qt4
   ];
 
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix
index c8414bbb83a0e..663f89b325a27 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@@ -11,8 +11,10 @@ stdenv.mkDerivation {
   };
 
   patches = [ ./xlib.patch ];
+
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    perl perlXMLParser pkgconfig gtk2 scrollkeeper
+    perl perlXMLParser gtk2 scrollkeeper
     libglade libXmu gettext lame libXdamage libXfixes libXext libX11
   ];