pyrox.dev
lol
Merge pull request #170063 from Moredread/prusa-slicer
prusa-slicer: use patched wxWidgets
authored by
Guillaume Girol
and committed by
GitHub
b03fed42
60ff8d23
+23
-9
+20
-6
pkgs/applications/misc/prusa-slicer/default.nix
+20
-6
pkgs/applications/misc/prusa-slicer/default.nix
···
1
-
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook
2
-
, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme
3
-
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
4
-
}:
5
-
stdenv.mkDerivation rec {
1
+
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem
2
+
, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat
3
+
, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt
4
+
, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
5
+
, wxGTK31-gtk3-override ? null }:
6
+
let
7
+
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
8
+
pname = "wxwidgets-prusa3d-patched";
9
+
version = "3.1.4";
10
+
src = fetchFromGitHub {
11
+
owner = "prusa3d";
12
+
repo = "wxWidgets";
13
+
rev = "489f6118256853cf5b299d595868641938566cdb";
14
+
hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ=";
15
+
fetchSubmodules = true;
16
+
};
17
+
});
18
+
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
19
+
in stdenv.mkDerivation rec {
6
20
pname = "prusa-slicer";
7
21
version = "2.4.2";
8
22
···
34
48
pcre
35
49
systemd
36
50
tbb
37
-
wxGTK31-gtk3
51
+
wxGTK31-gtk3-override'
38
52
xorg.libX11
39
53
] ++ checkInputs;
40
54
+3
-3
pkgs/applications/misc/prusa-slicer/super-slicer.nix
+3
-3
pkgs/applications/misc/prusa-slicer/super-slicer.nix
···
1
-
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
1
+
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }:
2
2
let
3
3
appname = "SuperSlicer";
4
4
pname = "super-slicer";
···
54
54
passthru = allVersions;
55
55
56
56
};
57
-
58
-
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions;
57
+
prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; };
58
+
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions;
59
59
in
60
60
allVersions.stable