Unverified Commit cf1c78c3 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

wxwidgets_3_{1,2}: rename from wxGTK3{1,2} (#489736)

parents 93a55c87 62efab0d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ in
      description = "Nix top-level packages to be compiled using CCache";
      default = [ ];
      example = [
        "wxGTK32"
        "wxwidgets_3_2"
        "ffmpeg"
        "libav_all"
      ];
+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
  pkg-config,
  unzip,
  portaudio,
  wxGTK32,
  wxwidgets_3_2,
  sox,
}:

@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];
  buildInputs = [
    portaudio
    wxGTK32
    wxwidgets_3_2
  ];

  # TODO:
+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@
  sqlite,
  tinyxml,
  util-linux,
  wxGTK32,
  wxwidgets_3_2,
  libxtst,
  libxdmcp,
  xz,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
    rapidjson
    sqlite
    tinyxml
    wxGTK32
    wxwidgets_3_2
    xz
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
  fetchpatch,
  cmake,
  sqlite,
  wxGTK32,
  wxwidgets_3_2,
  libusb1,
  soapysdr,
  mesa_glu,
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
    fltk
    libx11
    mesa_glu
    wxGTK32
    wxwidgets_3_2
  ];

  doInstallCheck = true;
+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@
  python3,
  stdenv,
  wrapGAppsHook3,
  wxGTK32,
  wxwidgets_3_2,
  zlib,
  # Boolean guard flags
  alsaSupport ? stdenv.hostPlatform.isLinux,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
    ninja
    pkg-config
    python3
    wxGTK32
    wxwidgets_3_2
    wrapGAppsHook3
  ];

@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
    libGL
    libass
    libuchardet
    wxGTK32
    wxwidgets_3_2
    zlib
  ]
  ++ lib.optionals alsaSupport [ alsa-lib ]
Loading