From b61609007458b10b5eb9765f11f1f4471a6e0bf4 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Wed, 8 Jan 2025 10:14:39 +0900 Subject: [PATCH] povray: fix build --- .../povray/default.nix => by-name/po/povray/package.nix} | 6 ++++++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/{tools/graphics/povray/default.nix => by-name/po/povray/package.nix} (91%) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/by-name/po/povray/package.nix similarity index 91% rename from pkgs/tools/graphics/povray/default.nix rename to pkgs/by-name/po/povray/package.nix index 1309f506c5564..9dd19ef88e2a5 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/by-name/po/povray/package.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: { sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} ''; + # https://github.com/POV-Ray/povray/issues/460 + env.NIX_CFLAGS_COMPILE = toString [ + "-fno-finite-math-only" + "-DBOOST_BIND_GLOBAL_PLACEHOLDERS" + ]; + configureFlags = [ "COMPILED_BY=NixOS" "--with-boost-thread=boost_thread" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2adaaccdbd27..78a080bb0215b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4818,12 +4818,6 @@ with pkgs; polaris-web = callPackage ../servers/polaris/web.nix { }; - povray = callPackage ../tools/graphics/povray { - # https://github.com/POV-Ray/povray/issues/460 - # https://github.com/NixOS/nixpkgs/issues/311017 - stdenv = gcc12Stdenv; - }; - projectlibre = callPackage ../applications/misc/projectlibre { jre = jre8; jdk = jdk8;