diff options
author | William A. Kennington III <william@wkennington.com> | 2014-09-14 15:53:05 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-09-21 15:18:16 -0700 |
commit | f327e9c9221d39dac55e565819054122ead64218 (patch) | |
tree | 28a94703e366294537fe6f1a135651f9d684cdaa /pkgs/applications | |
parent | 89cf0e4fea8f2839a7423452097fd7fdc662cb48 (diff) | |
download | nixlib-f327e9c9221d39dac55e565819054122ead64218.tar nixlib-f327e9c9221d39dac55e565819054122ead64218.tar.gz nixlib-f327e9c9221d39dac55e565819054122ead64218.tar.bz2 nixlib-f327e9c9221d39dac55e565819054122ead64218.tar.lz nixlib-f327e9c9221d39dac55e565819054122ead64218.tar.xz nixlib-f327e9c9221d39dac55e565819054122ead64218.tar.zst nixlib-f327e9c9221d39dac55e565819054122ead64218.zip |
boostHeaders: regular boost package now only contains headers
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/office/scribus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/omxplayer/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 4026031de084..fb7a41d62466 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 , libart_lgpl, qt4, python, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }: +, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: stdenv.mkDerivation rec { name = "scribus-1.4.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 python cups fontconfig libjpeg zlib libpng podofo aspell cairo - boostHeaders # for internal 2geom library + boost # for internal 2geom library libXaw libXext libX11 libXtst libXi libXinerama libpthreadstubs libXau libXdmcp ]; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 3add2646ad9e..449190cfaa17 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }: +{ stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }: let ffmpeg = stdenv.mkDerivation rec { @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp omxplayer.bin $out/bin ''; - buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ]; + buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ]; meta = { homepage = https://github.com/huceke/omxplayer; |