diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 40d9584742cc..2c23e51c22a6 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -12,24 +12,6 @@ stdenv.mkDerivation rec { 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 = { description = "OpenAL, a cross-platform 3D audio API"; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 72666deba675..ae0a5d1b4c53 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "vtk-5.2.1"; src = fetchurl { - url = http://www.vtk.org/files/release/5.2/vtk-5.2.1.tar.gz; - sha256 = "c81521b3767a044745336212cbde500d6e97a1f8ba647bc590857e36f57003bb"; + url = http://www.vtk.org/files/release/5.4/vtk-5.4.2.tar.gz; + sha256 = "0gd7xlxiqww6xxcs2kicz0g6k147y3200np4jnsf10vlxs10az03"; }; buildInputs = [ cmake mesa libX11 xproto libXt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa0bcc2bcc5f..896dbc783c0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4227,7 +4227,8 @@ let }; 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)