diff options
author | William A. Kennington III <william@wkennington.com> | 2014-09-19 10:56:08 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-09-21 17:20:59 -0700 |
commit | 31220480d83a642f8bf6fe0529633c9460384666 (patch) | |
tree | 816642d7700126191bb3ba070c42229213a8c690 /pkgs/desktops/kde-4.12/kdeedu | |
parent | be2c1d79082e92e17c58566fe01cba9fa13857e5 (diff) | |
download | nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.gz nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.bz2 nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.lz nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.xz nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.zst nixlib-31220480d83a642f8bf6fe0529633c9460384666.zip |
boost: Update depdendent packages
Diffstat (limited to 'pkgs/desktops/kde-4.12/kdeedu')
-rw-r--r-- | pkgs/desktops/kde-4.12/kdeedu/kig.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.12/kdeedu/rocs.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix index 37906c32bcb2..fb442e2ef629 100644 --- a/pkgs/desktops/kde-4.12/kdeedu/kig.nix +++ b/pkgs/desktops/kde-4.12/kdeedu/kig.nix @@ -1,6 +1,6 @@ { kde, kdelibs, boost, python}: kde { - buildInputs = [ kdelibs boost python ]; + buildInputs = [ kdelibs boost boost.lib python ]; cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1"; meta = { diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix index ce30d11fda31..135598ded90a 100644 --- a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix +++ b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix @@ -1,7 +1,9 @@ { kde, kdelibs, boost, grantlee }: - +let + boostpkg = boost.override { enableExceptions = true; }; +in kde { - buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ]; + buildInputs = [ kdelibs boostpkg boostpkg.lib grantlee ]; NIX_CFLAGS_COMPILE = "-fexceptions"; |