colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #306391 from kirillrdy/kr/bambu-studio

Browse Source 
bambu-studio, orca-slicer: prevent collision of LICENSE
This commit is contained in:
kirillrdy 2024-04-24 20:30:19 +10:00 committed by GitHub
commit c115010a8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 95 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
pkgs/applications/misc/bambu-studio/default.nix
View File

@ -1,49 +1,50 @@
{ stdenv {
, lib stdenv,
, openexr lib,
, jemalloc openexr,
, c-blosc jemalloc,
, binutils c-blosc,
, fetchFromGitHub binutils,
, cmake fetchFromGitHub,
, pkg-config cmake,
, wrapGAppsHook pkg-config,
, boost179 wrapGAppsHook,
, cereal boost179,
, cgal_5 cereal,
, curl cgal_5,
, dbus curl,
, eigen dbus,
, expat eigen,
, gcc-unwrapped expat,
, glew gcc-unwrapped,
, glfw glew,
, glib glfw,
, glib-networking glib,
, gmp glib-networking,
, gstreamer gmp,
, gst-plugins-base gstreamer,
, gst-plugins-bad gst-plugins-base,
, gst-plugins-good gst-plugins-bad,
, gtest gst-plugins-good,
, gtk3 gtest,
, hicolor-icon-theme gtk3,
, ilmbase hicolor-icon-theme,
, libpng ilmbase,
, mesa libpng,
, mpfr mesa,
, nlopt mpfr,
, opencascade-occt nlopt,
, openvdb opencascade-occt,
, pcre openvdb,
, qhull pcre,
, systemd qhull,
, tbb_2021_11 systemd,
, webkitgtk tbb_2021_11,
, wxGTK31 webkitgtk,
, xorg wxGTK31,
, fetchpatch xorg,
, withSystemd ? stdenv.isLinux fetchpatch,
withSystemd ? stdenv.isLinux,
}: }:
let let
wxGTK31' = wxGTK31.overrideAttrs (old: { wxGTK31' = wxGTK31.overrideAttrs (old: {
@ -53,7 +54,14 @@ let
]; ];
}); });
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
buildInputs = [ openexr boost179 tbb_2021_11 jemalloc c-blosc ilmbase ]; buildInputs = [
openexr
boost179
tbb_2021_11
jemalloc
c-blosc
ilmbase
];
}); });
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -106,9 +114,7 @@ stdenv.mkDerivation rec {
webkitgtk webkitgtk
wxGTK31' wxGTK31'
xorg.libX11 xorg.libX11
] ++ lib.optionals withSystemd [ ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;
systemd
] ++ checkInputs;
patches = [ patches = [
# Fix for webkitgtk linking # Fix for webkitgtk linking
@ -169,11 +175,8 @@ stdenv.mkDerivation rec {
# needed to prevent collisions between the LICENSE.txt files of # needed to prevent collisions between the LICENSE.txt files of
# bambu-studio and orca-slicer. # bambu-studio and orca-slicer.
postInstall = '' postInstall = ''
mkdir -p $out/share/doc mv $out/LICENSE.txt $out/share/BambuStudio/LICENSE.txt
mv $out/LICENSE.txt $out/share/doc/LICENSE.txt mv $out/README.md $out/share/BambuStudio/README.md
if [ -f $out/README.md ]; then
mv $out/README.md $out/share/doc/README.md
fi
''; '';
meta = with lib; { meta = with lib; {

60
pkgs/applications/misc/bambu-studio/orca-slicer.nix
View File

@ -1,27 +1,41 @@
{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: {
lib,
fetchFromGitHub,
bambu-studio,
}:
bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { bambu-studio.overrideAttrs (
version = "2.0.0"; finalAttrs: previousAttrs: {
pname = "orca-slicer"; version = "2.0.0";
pname = "orca-slicer";
# Don't inherit patches from bambu-studio # Don't inherit patches from bambu-studio
patches = [ patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ];
./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SoftFever"; owner = "SoftFever";
repo = "OrcaSlicer"; repo = "OrcaSlicer";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw=";
}; };
meta = with lib; { # needed to prevent collisions between the LICENSE.txt files of
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; # bambu-studio and orca-slicer.
homepage = "https://github.com/SoftFever/OrcaSlicer"; postInstall = ''
license = licenses.agpl3Only; mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt
maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; '';
mainProgram = "orca-slicer";
platforms = platforms.linux; meta = with lib; {
}; description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc";
}) homepage = "https://github.com/SoftFever/OrcaSlicer";
license = licenses.agpl3Only;
maintainers = with maintainers; [
zhaofengli
ovlach
pinpox
];
mainProgram = "orca-slicer";
platforms = platforms.linux;
};
}
)