public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm: propagate ncurses

Browse Source 
Cf. discussion at https://github.com/NixOS/nixpkgs/commit/4eefe1a7
This commit is contained in:
Vladimír Čunát 2014-01-26 14:08:23 +01:00
parent edb1e2996f
commit 120be16479
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/3.4/llvm.nix
View File

@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
mv compiler-rt-${version} $sourceRoot/projects/compiler-rt mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
''; '';
buildInputs = [ perl groff cmake libxml2 python libffi valgrind ncurses ]; propagatedBuildInputs = [ ncurses ]; # linked against it, e.g. mesa needs it now, too
buildInputs = [ perl groff cmake libxml2 python libffi valgrind ];
# hacky fix: created binaries need to be run before installation # hacky fix: created binaries need to be run before installation
preBuild = '' preBuild = ''

4
pkgs/development/libraries/mesa/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
, python, libxml2Python, file, expat, makedepend , python, libxml2Python, file, expat, makedepend
, libdrm, xorg, wayland, udev, llvm, libffi , libdrm, xorg, wayland, udev, llvm, libffi
, libvdpau, libelf, ncurses , libvdpau, libelf
, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
, enableExtraFeatures ? false # not maintained , enableExtraFeatures ? false # not maintained
}: }:
@ -87,7 +87,7 @@ stdenv.mkDerivation {
buildInputs = with xorg; [ buildInputs = with xorg; [
autoreconfHook intltool expat libxml2Python llvm autoreconfHook intltool expat libxml2Python llvm
libXfixes glproto dri2proto libX11 libXext libxcb libXt libXfixes glproto dri2proto libX11 libXext libxcb libXt
libffi wayland libvdpau libelf ncurses libffi wayland libvdpau libelf
] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
++ optional stdenv.isLinux udev ++ optional stdenv.isLinux udev
; ;