BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #170063 from Moredread/prusa-slicer

Browse source 
prusa-slicer: use patched wxWidgets
This commit is contained in:
Guillaume Girol 2022-06-05 18:28:56 +00:00 committed by GitHub
commit b03fed4229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -1,8 +1,22 @@
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook
, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
}:
stdenv.mkDerivation rec {
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem
, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat
, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt
, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
, wxGTK31-gtk3-override ? null }:
let
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
pname = "wxwidgets-prusa3d-patched";
version = "3.1.4";
src = fetchFromGitHub {
owner = "prusa3d";
repo = "wxWidgets";
rev = "489f6118256853cf5b299d595868641938566cdb";
hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ=";
fetchSubmodules = true;
};
});
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
in stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.4.2";
@ -34,7 +48,7 @@ stdenv.mkDerivation rec {
pcre
systemd
tbb
wxGTK31-gtk3
wxGTK31-gtk3-override'
xorg.libX11
] ++ checkInputs;

6
pkgs/applications/misc/prusa-slicer/super-slicer.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }:
let
appname = "SuperSlicer";
pname = "super-slicer";
@ -54,7 +54,7 @@ let
passthru = allVersions;
};
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions;
prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; };
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions;
in
allVersions.stable