From d9b20088022191794cd8972948014899b8b6264d Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Fri, 17 Feb 2023 14:55:46 +0000 Subject: [PATCH] opencascade: remove https://github.com/tpaviot/oce/issues/745 --- .../libraries/opencascade/default.nix | 65 ------------------- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 3 - 3 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 pkgs/development/libraries/opencascade/default.nix diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix deleted file mode 100644 index 2934558b58752..0000000000000 --- a/pkgs/development/libraries/opencascade/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb, - OpenCL, Cocoa -}: - -stdenv.mkDerivation rec { - pname = "opencascade-oce"; - version = "0.18.3"; - - src = fetchFromGitHub { - owner = "tpaviot"; - repo = "oce"; - rev = "OCE-${version}"; - sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig"; - }; - - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ - libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8 - gl2ps tbb - ] - ++ lib.optionals stdenv.isDarwin [OpenCL Cocoa] - ; - - cmakeFlags = [ - "-DOCE_INSTALL_PREFIX=${placeholder "out"}" - "-DOCE_WITH_FREEIMAGE=ON" - "-DOCE_WITH_VTK=ON" - "-DOCE_WITH_GL2PS=ON" - "-DOCE_MULTITHREAD_LIBRARY=TBB" - ] - ++ lib.optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; - - patches = [ - # Use fontconfig instead of hardcoded directory list - # https://github.com/tpaviot/oce/pull/714 - (fetchpatch { - url = "https://github.com/tpaviot/oce/commit/9643432b27fec8974ca0ee15c3c372f5fe8fc069.patch"; - sha256 = "1wd940rszmh5apcpk5fv6126h8mcjcy4rjifrql5d4ac90v06v4c"; - }) - # Fix for glibc 2.26 - (fetchpatch { - url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; - sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; - }) - (fetchpatch { - url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch"; - sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc"; - }) - ]; - - postPatch = '' - # make sure the installed cmake file uses absolute paths for fontconfig - substituteInPlace adm/cmake/TKService/CMakeLists.txt \ - --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES - ''; - - meta = with lib; { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = "https://github.com/tpaviot/oce"; - maintainers = [ maintainers.viric ]; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a440ec395e513..f02469c4760e7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1230,7 +1230,8 @@ mapAliases ({ openafs_1_8 = openafs; # Added 2022-08-22 openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 - opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 + opencascade_oce = throw "'opencascade' is unmaintained. Instead, use 'opencascade-occt'"; # Modified 2023-02-17 + opencascade = throw "'opencascade' is unmaintained. Instead, use 'opencascade-occt'"; # Added 2023-02-17 opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76b9acd9b32d5..fac268724e627 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24309,9 +24309,6 @@ with pkgs; python = python3; }; - opencascade = callPackage ../development/libraries/opencascade { - inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; - }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; opencl-headers = callPackage ../development/libraries/opencl-headers { };