diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
| commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
| tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /pkgs/development/libraries/boost/1.55.nix | |
| parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
| parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
| download | nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip | |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'pkgs/development/libraries/boost/1.55.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/1.55.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index a10cd8ce220..0a38f35af75 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -3,7 +3,7 @@ callPackage ./generic.nix (args // rec { version = "1.55.0"; - patches = [ ./clang-math.patch ./clang-math-2.patch ]; + patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2"; |