Unverified Commit 412b9917 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #198064 from wegank/wxgtk31-drop-gtk2

parents ae7bfd18 30d66019

pkgs/applications/audio/tenacity/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
, lib

, fetchFromSourcehut

, cmake

, wxGTK

, wxGTK31

, gtk3

, pkg-config

, python3

, gettext
@@ -123,8 +124,8 @@ stdenv.mkDerivation rec { 
    sratom

    suil

    twolame

    wxGTK

    wxGTK.gtk

    wxGTK31

    gtk3

  ] ++ lib.optionals stdenv.isLinux [

    at-spi2-core

    dbus

pkgs/applications/editors/codeblocks/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31-gtk3, gtk3

{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3

, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook

}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ];

  buildInputs = [ wxGTK31-gtk3 gtk3 ]

  buildInputs = [ wxGTK31 gtk3 ]

    ++ optionals contribPlugins [ hunspell gamin boost ];

  enableParallelBuilding = true;

  patches = [

pkgs/applications/gis/saga/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
, pkg-config

# not native

, gdal

, wxGTK31-gtk3

, wxGTK31

, proj

, dxflib

, curl
@@ -56,7 +56,7 @@ mkDerivation rec { 
    libsvm

    hdf5

    gdal

    wxGTK31-gtk3

    wxGTK31

    proj

    libharu

    opencv

pkgs/applications/misc/prusa-slicer/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ 
, qhull

, systemd

, tbb

, wxGTK31-gtk3

, wxGTK31

, xorg

, fetchpatch

, wxGTK31-gtk3-override ? null

, wxGTK31-override ? null

}:

let

  wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {

  wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec {

    pname = "wxwidgets-prusa3d-patched";

    version = "3.1.4";

    src = fetchFromGitHub {
@@ -45,7 +45,7 @@ let 
      fetchSubmodules = true;

    };

  });

  wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;

  wxGTK31-override' = if wxGTK31-override == null then wxGTK31-prusa else wxGTK31-override;

in

stdenv.mkDerivation rec {

  pname = "prusa-slicer";
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec { 
    pcre

    systemd

    tbb

    wxGTK31-gtk3-override'

    wxGTK31-override'

    xorg.libX11

  ] ++ checkInputs;

pkgs/applications/misc/prusa-slicer/super-slicer.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }:

{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31 }:

let

  appname = "SuperSlicer";

  pname = "super-slicer";
@@ -71,7 +71,7 @@ let 
    passthru = allVersions;



  };

  prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; };

  prusa-slicer' = prusa-slicer.override { wxGTK31-override = wxGTK31; };

  allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions;

in

allVersions.stable