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

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

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
parent 6a81ca6b1c 2715a8ad3a
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
, openexr
, jemalloc
, c-blosc
, binutils
, fetchFromGitHub
, cmake
, pkg-config
, wrapGAppsHook
, boost179
, cereal
, cgal_5
, curl
, dbus
, eigen
, expat
, gcc-unwrapped
, glew
, glfw
, glib
, glib-networking
, gmp
, gstreamer
, gst-plugins-base
, gst-plugins-bad
, gst-plugins-good
, gtest
, gtk3
, hicolor-icon-theme
, ilmbase
, libpng
, mesa
, mpfr
, nlopt
, opencascade-occt
, openvdb
, pcre
, qhull
, systemd
, tbb_2021_11
, webkitgtk
, wxGTK31
, xorg
, fetchpatch
, withSystemd ? stdenv.isLinux
{
stdenv,
lib,
openexr,
jemalloc,
c-blosc,
binutils,
fetchFromGitHub,
cmake,
pkg-config,
wrapGAppsHook,
boost179,
cereal,
cgal_5,
curl,
dbus,
eigen,
expat,
gcc-unwrapped,
glew,
glfw,
glib,
glib-networking,
gmp,
gstreamer,
gst-plugins-base,
gst-plugins-bad,
gst-plugins-good,
gtest,
gtk3,
hicolor-icon-theme,
ilmbase,
libpng,
mesa,
mpfr,
nlopt,
opencascade-occt,
openvdb,
pcre,
qhull,
systemd,
tbb_2021_11,
webkitgtk,
wxGTK31,
xorg,
fetchpatch,
withSystemd ? stdenv.isLinux,
}:
let
wxGTK31' = wxGTK31.overrideAttrs (old: {
@ -53,7 +54,14 @@ let
];
});
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
stdenv.mkDerivation rec {
@ -106,9 +114,7 @@ stdenv.mkDerivation rec {
webkitgtk
wxGTK31'
xorg.libX11
] ++ lib.optionals withSystemd [
systemd
] ++ checkInputs;
] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;
patches = [
# Fix for webkitgtk linking
@ -169,11 +175,8 @@ stdenv.mkDerivation rec {
# needed to prevent collisions between the LICENSE.txt files of
# bambu-studio and orca-slicer.
postInstall = ''
mkdir -p $out/share/doc
mv $out/LICENSE.txt $out/share/doc/LICENSE.txt
if [ -f $out/README.md ]; then
mv $out/README.md $out/share/doc/README.md
fi
mv $out/LICENSE.txt $out/share/BambuStudio/LICENSE.txt
mv $out/README.md $out/share/BambuStudio/README.md
'';
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: {
version = "2.0.0";
pname = "orca-slicer";
bambu-studio.overrideAttrs (
finalAttrs: previousAttrs: {
version = "2.0.0";
pname = "orca-slicer";
# Don't inherit patches from bambu-studio
patches = [
./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
];
# Don't inherit patches from bambu-studio
patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ];
src = fetchFromGitHub {
owner = "SoftFever";
repo = "OrcaSlicer";
rev = "v${finalAttrs.version}";
hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw=";
};
src = fetchFromGitHub {
owner = "SoftFever";
repo = "OrcaSlicer";
rev = "v${finalAttrs.version}";
hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw=";
};
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;
};
})
# needed to prevent collisions between the LICENSE.txt files of
# bambu-studio and orca-slicer.
postInstall = ''
mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt
'';
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;
};
}
)