summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-03-15 17:26:49 +0200
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-03-15 17:26:49 +0200
commitbc26a2789daccf1863679f91dc60496a2d5142d9 (patch)
tree629cf7e3abfa4aa3a271203fe629c284fa1fe59a
parentc817b58614f31bfeeaaeaab0754f3cd878497d25 (diff)
downloadnixpkgs-bc26a2789daccf1863679f91dc60496a2d5142d9.tar
nixpkgs-bc26a2789daccf1863679f91dc60496a2d5142d9.tar.gz
nixpkgs-bc26a2789daccf1863679f91dc60496a2d5142d9.tar.bz2
nixpkgs-bc26a2789daccf1863679f91dc60496a2d5142d9.tar.lz
nixpkgs-bc26a2789daccf1863679f91dc60496a2d5142d9.tar.xz
nixpkgs-bc26a2789daccf1863679f91dc60496a2d5142d9.tar.zst
nixpkgs-bc26a2789daccf1863679f91dc60496a2d5142d9.zip
radiotray-ng: migrate to wxGTK32
-rw-r--r--pkgs/applications/audio/radiotray-ng/default.nix3
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 1d638c01f20..3196d492fb5 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}"
   ];
 
+  # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   nativeCheckInputs = [ gtest ];
   doCheck = !stdenv.isAarch64; # single failure that I can't explain
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee5053358d9..bc35cb280d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32992,7 +32992,7 @@ with pkgs;
   radioboat = callPackage ../applications/audio/radioboat { };
 
   radiotray-ng = callPackage ../applications/audio/radiotray-ng {
-    wxGTK = wxGTK30;
+    wxGTK = wxGTK32;
   };
 
   raiseorlaunch = callPackage ../applications/misc/raiseorlaunch { };