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 | |
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
-rw-r--r-- | pkgs/applications/office/scribus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/omxplayer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/header-only-wrapper.nix | 30 | ||||
-rw-r--r-- | pkgs/games/openxcom/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/mini-httpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
6 files changed, 9 insertions, 44 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; diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix deleted file mode 100644 index 96c9216a371b..000000000000 --- a/pkgs/development/libraries/boost/header-only-wrapper.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 19aff03dacaa..7b939af096ac 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -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 }: let version = "1.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { 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 ]; meta = { diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index b8848f1e5d80..3a1cf6870692 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boostHeaders }: +{ stdenv, fetchurl, boost }: stdenv.mkDerivation rec { name = "mini-httpd-1.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd"; }; - buildInputs = [ boostHeaders ]; + buildInputs = [ boost ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d5df4fd5209..97f1a16c2250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1616,7 +1616,6 @@ let monit = callPackage ../tools/system/monit { }; mosh = callPackage ../tools/networking/mosh { - boost = boostHeaders; inherit (perlPackages) IOTty; }; @@ -4581,8 +4580,6 @@ let boost156 = callPackage ../development/libraries/boost/1.56.nix { }; boost = boost156; - boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { }; - botan = callPackage ../development/libraries/botan { }; botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; @@ -4686,9 +4683,7 @@ let cppunit = callPackage ../development/libraries/cppunit { }; - cppnetlib = callPackage ../development/libraries/cppnetlib { - boost = boostHeaders; - }; + cppnetlib = callPackage ../development/libraries/cppnetlib { }; cracklib = callPackage ../development/libraries/cracklib { }; |