diff options
author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /pkgs/tools/video | |
parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
download | nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/video')
-rw-r--r-- | pkgs/tools/video/mjpegtools/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 489b67f483b..0e90a5071b7 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ libdv libjpeg libpng pkgconfig ] ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ]; + NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL}/include/SDL"; + postPatch = '' sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure ''; |