diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-03-06 14:44:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-03-06 14:44:01 +0100 |
| commit | 0ea7d9b6f9437cc2db761967a782786453bc61ba (patch) | |
| tree | cbc5053243a941c5fad3b2192e2feb14041af7a7 | |
| parent | 33153a216679f903478ad6a3a9a0b5aea489db91 (diff) | |
| download | nixpkgs-0ea7d9b6f9437cc2db761967a782786453bc61ba.tar nixpkgs-0ea7d9b6f9437cc2db761967a782786453bc61ba.tar.gz nixpkgs-0ea7d9b6f9437cc2db761967a782786453bc61ba.tar.bz2 nixpkgs-0ea7d9b6f9437cc2db761967a782786453bc61ba.tar.lz nixpkgs-0ea7d9b6f9437cc2db761967a782786453bc61ba.tar.xz nixpkgs-0ea7d9b6f9437cc2db761967a782786453bc61ba.tar.zst nixpkgs-0ea7d9b6f9437cc2db761967a782786453bc61ba.zip | |
opencascade*: fix build after mesa update
| -rw-r--r-- | pkgs/development/libraries/opencascade/6.5.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencascade/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencascade/oce.nix | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index 7cc47a30eb7..a150f53bb86 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { # -fpermissive helps building opencascade, although gcc detects a flaw in the code # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive"; + NIX_CFLAGS_COMPILE = "-fpermissive" + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + + " -DGLX_GLXEXT_LEGACY"; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 1ce38ab7b3c..ec15d9d631e 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" ''; + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix index 480664a0d4d..4988ee6ef24 100644 --- a/pkgs/development/libraries/opencascade/oce.nix +++ b/pkgs/development/libraries/opencascade/oce.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" ''; + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + enableParallelBuilding = true; meta = { |