diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-06-24 12:36:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 12:36:33 +0800 |
| commit | fb5e1f7e54660be3579a848cc57328b09d2099a5 (patch) | |
| tree | fda8a2b7355745b92e414403f2408a4267cb97b2 | |
| parent | Merge pull request #176488 from NixOS/backport-176326-to-release-22.05 (diff) | |
| parent | prusa-slicer: use patched wxWidgets (diff) | |
| download | nixpkgs-fb5e1f7e54660be3579a848cc57328b09d2099a5.tar.gz | |
Merge pull request #176698 from NixOS/backport-170063-to-release-22.05
[Backport release-22.05] prusa-slicer: use patched wxWidgets
| -rw-r--r-- | pkgs/applications/misc/prusa-slicer/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/applications/misc/prusa-slicer/super-slicer.nix | 6 |
2 files changed, 23 insertions, 9 deletions
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 8f7e371a8e56..1488538cc55e 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -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; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 41ba78622708..742fa6f8e20e 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -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 |