Unverified Commit 20ef1993 authored by Guy Chronister's avatar Guy Chronister
Browse files

prusa-slicer: migrate to by-name

parent 1522cd9e

pkgs/applications/misc/prusa-slicer/default.nix→pkgs/by-name/pr/prusa-slicer/package.nix

+8 −6
Original line number Diff line number Diff line 
{

  stdenv,

  clangStdenv,

  lib,

  binutils,

  fetchFromGitHub,
@@ -36,7 +36,7 @@ 
  catch2_3,

  webkitgtk_4_1,

  ctestCheckHook,

  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,

  withSystemd ? lib.meta.availableOn clangStdenv.hostPlatform systemd,

  systemd,

  udevCheckHook,

  z3,
@@ -60,10 +60,12 @@ let 
  opencascade-override' =

    if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;

in

stdenv.mkDerivation (finalAttrs: {

clangStdenv.mkDerivation (finalAttrs: {

  pname = "prusa-slicer";

  version = "2.9.4";



  # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory

  # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds

  # with --cores 32 on clang).

  src = fetchFromGitHub {

    owner = "prusa3d";

    repo = "PrusaSlicer";
@@ -81,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { 
  # (not applicable to super-slicer fork)

  postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") (

    # Patch required for GCC 14, but breaks on clang

    lib.optionalString stdenv.cc.isGNU ''

    lib.optionalString clangStdenv.cc.isGNU ''

      substituteInPlace src/slic3r-arrange/include/arrange/DataStoreTraits.hpp \

        --replace-fail \

        "WritableDataStoreTraits<ArrItem>::template set" \
@@ -250,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ];

    platforms = lib.platforms.unix;

  }

  // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {

  // lib.optionalAttrs (clangStdenv.hostPlatform.isDarwin) {

    mainProgram = "PrusaSlicer";

  };

})

pkgs/top-level/all-packages.nix

+0 −7
Original line number Diff line number Diff line
@@ -10978,13 +10978,6 @@ with pkgs; 


  curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { });



  prusa-slicer = callPackage ../applications/misc/prusa-slicer {

    # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory

    # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds

    # with --cores 32 on clang).

    stdenv = clangStdenv;

  };



  super-slicer-beta = super-slicer.beta;



  super-slicer-latest = super-slicer.latest;