colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boostHeaders: regular boost package now only contains headers

Browse Source
This commit is contained in:
William A. Kennington III 2014-09-14 15:53:05 -07:00
parent 89cf0e4fea
commit f327e9c922
6 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/scribus/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt4, python, cups, fontconfig, libjpeg , 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 { stdenv.mkDerivation rec {
name = "scribus-1.4.3"; name = "scribus-1.4.3";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
python cups fontconfig python cups fontconfig
libjpeg zlib libpng podofo aspell cairo libjpeg zlib libpng podofo aspell cairo
boostHeaders # for internal 2geom library boost # for internal 2geom library
libXaw libXext libX11 libXtst libXi libXinerama libXaw libXext libX11 libXtst libXi libXinerama
libpthreadstubs libXau libXdmcp libpthreadstubs libXau libXdmcp
]; ];

4
pkgs/applications/video/omxplayer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }: { stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }:
let let
ffmpeg = stdenv.mkDerivation rec { ffmpeg = stdenv.mkDerivation rec {
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp omxplayer.bin $out/bin cp omxplayer.bin $out/bin
''; '';
buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ]; buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ];
meta = { meta = {
homepage = https://github.com/huceke/omxplayer; homepage = https://github.com/huceke/omxplayer;

30
pkgs/development/libraries/boost/header-only-wrapper.nix
View File

@ -1,30 +0,0 @@
{ stdenv, fetchurl, boost }:
let
version = stdenv.lib.removePrefix "boost-" boost.name;
pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name;
in
stdenv.mkDerivation {
name = "boost-headers-${version}";
src = boost.src;
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/include
tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
'';
preferLocalBuild = true;
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ];
};
}

4
pkgs/games/openxcom/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boostHeaders {stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boost
, SDL, SDL_image, SDL_mixer, SDL_gfx }: , SDL, SDL_image, SDL_mixer, SDL_gfx }:
let version = "1.0.0"; in let version = "1.0.0"; in
@ -10,7 +10,7 @@ stdenv.mkDerivation {
name = "openxcom-${version}.tar.gz"; name = "openxcom-${version}.tar.gz";
}; };
buildInputs = [ cmake mesa zlib openssl libyamlcpp boostHeaders buildInputs = [ cmake mesa zlib openssl libyamlcpp boost
SDL SDL_image SDL_mixer SDL_gfx ]; SDL SDL_image SDL_mixer SDL_gfx ];
meta = { meta = {

4
pkgs/servers/http/mini-httpd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boostHeaders }: { stdenv, fetchurl, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mini-httpd-1.4"; name = "mini-httpd-1.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd"; sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd";
}; };
buildInputs = [ boostHeaders ]; buildInputs = [ boost ];
enableParallelBuilding = true; enableParallelBuilding = true;

7
pkgs/top-level/all-packages.nix
View File

@ -1616,7 +1616,6 @@ let
monit = callPackage ../tools/system/monit { }; monit = callPackage ../tools/system/monit { };
mosh = callPackage ../tools/networking/mosh { mosh = callPackage ../tools/networking/mosh {
boost = boostHeaders;
inherit (perlPackages) IOTty; inherit (perlPackages) IOTty;
}; };
@ -4581,8 +4580,6 @@ let
boost156 = callPackage ../development/libraries/boost/1.56.nix { }; boost156 = callPackage ../development/libraries/boost/1.56.nix { };
boost = boost156; boost = boost156;
boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
botan = callPackage ../development/libraries/botan { }; botan = callPackage ../development/libraries/botan { };
botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
@ -4686,9 +4683,7 @@ let
cppunit = callPackage ../development/libraries/cppunit { }; cppunit = callPackage ../development/libraries/cppunit { };
cppnetlib = callPackage ../development/libraries/cppnetlib { cppnetlib = callPackage ../development/libraries/cppnetlib { };
boost = boostHeaders;
};
cracklib = callPackage ../development/libraries/cracklib { }; cracklib = callPackage ../development/libraries/cracklib { };