diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-11 09:49:56 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-11 09:49:56 +0100 |
| commit | e9c12f6936b877eb707203f12170bac85255db50 (patch) | |
| tree | aeaa4249ddf5e1a0094d7d32e5f503a8363b8d4c /pkgs/os-specific | |
| parent | d1c9beebdbf22aa04419a1fe412c43160552aef7 (diff) | |
| parent | 2309acf72337b49eef43d1dfc90d850d2682a4a5 (diff) | |
| download | nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.gz nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.bz2 nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.lz nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.xz nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.zst nixlib-e9c12f6936b877eb707203f12170bac85255db50.zip | |
Merge older staging
There are some regressions, but not that many and I want the security update of openssl fast.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fd585515cf02..b7a8dc23a787 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -131,6 +131,10 @@ stdenv.mkDerivation rec { ++ optional nvidiaSupport "-DBUILD_NVIDIA=ON" ; + # `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`: + # src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = http://conky.sourceforge.net/; description = "Advanced, highly configurable system monitor based on torsmo"; |