diff --git a/large-sw.nix b/large-sw.nix index bd62f12..4cb60ad 100644 --- a/large-sw.nix +++ b/large-sw.nix @@ -1,17 +1,5 @@ { config, pkgs, ... }: -let curaWorkaround = with pkgs; stdenv.mkDerivation { - name = "cura-without-openmp-${cura.version}"; - # https://github.com/NixOS/nixpkgs/issues/59901 - buildPhase = '' - makeWrapper ${cura}/bin/cura $out/bin/cura --set OMP_NUM_THREADS 1 - mkdir $out/nix-support - cp ${cura}/nix-support/propagated-user-env-packages $out/nix-support - ''; - phases = [ "buildPhase" ]; - nativeBuildInputs = [ makeWrapper ]; -}; in - { environment.systemPackages = with pkgs.haskellPackages; with pkgs; [ idea-community-eap @@ -36,7 +24,11 @@ let curaWorkaround = with pkgs; stdenv.mkDerivation { # virtmanager - curaWorkaround + (if lib.hasAttr "curaPlugins" pkgs then + cura.override { + plugins = with curaPlugins; [ octoprint ]; + } + else cura) openscad # freecad meshlab