diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
| commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
| tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /doc | |
| parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
| parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
| download | nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/haskell.md | 2 | ||||
| -rw-r--r-- | doc/languages-frameworks/python.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 3da13dd9ed64..18b2fd65f44b 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -740,7 +740,7 @@ to the `stack.yaml` like the following: enable: true packages: [ zlib ] -Stack's Nix support knows to add `${zlib}/lib` and `${zlib}/include` as an +Stack's Nix support knows to add `${zlib.out}/lib` and `${zlib.dev}/include` as an `--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you can achieve the same effect by hand. First of all, run diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 56a4b526641f..9c67dc4ebe61 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -291,8 +291,8 @@ pyfftw = buildPythonPackage rec { # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; - LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" - CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" + LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" + CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" ''; meta = { |