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

Updating vtk; simplifying the openal cmake build expression.

Browse Source 
svn path=/nixpkgs/trunk/; revision=18888
This commit is contained in:
Lluís Batlle i Rossell 2009-12-11 07:16:16 +00:00
parent f3c23487a2
commit f5c5c0b4b6
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/openal/default.nix
View File

@ -12,24 +12,6 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake alsaLib ]; buildInputs = [ cmake alsaLib ];
cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/\"" +
" -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
" -DCMAKE_SKIP_BUILD_RPATH=ON" +
" -DCMAKE_BUILD_TYPE=Release" +
" -DCMAKE_INSTALL_PREFIX=$out";
dontUseCmakeConfigure = true;
# I rewrote the configure phase to get the $out references evaluated in
# cmakeFlags
configurePhase = ''
set -x
mkdir -p build;
cd build
eval -- "cmake .. $cmakeFlags"
set +x
'';
meta = { meta = {
description = "OpenAL, a cross-platform 3D audio API"; description = "OpenAL, a cross-platform 3D audio API";

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

@ -3,8 +3,8 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "vtk-5.2.1"; name = "vtk-5.2.1";
src = fetchurl { src = fetchurl {
url = http://www.vtk.org/files/release/5.2/vtk-5.2.1.tar.gz; url = http://www.vtk.org/files/release/5.4/vtk-5.4.2.tar.gz;
sha256 = "c81521b3767a044745336212cbde500d6e97a1f8ba647bc590857e36f57003bb"; sha256 = "0gd7xlxiqww6xxcs2kicz0g6k147y3200np4jnsf10vlxs10az03";
}; };
buildInputs = [ cmake mesa libX11 xproto libXt ]; buildInputs = [ cmake mesa libX11 xproto libXt ];

3
pkgs/top-level/all-packages.nix
View File

@ -4227,7 +4227,8 @@ let
}; };
openal = import ../development/libraries/openal { openal = import ../development/libraries/openal {
inherit fetchurl stdenv cmake alsaLib; inherit fetchurl cmake alsaLib;
stdenv = overrideGCC stdenv gcc43_wrapper2;
}; };
# added because I hope that it has been easier to compile on x86 (for blender) # added because I hope that it has been easier to compile on x86 (for blender)