Commit 49ca8bcb authored by awwpotato's avatar awwpotato Committed by Pascal Bach
Browse files

dsview: unbreak on GCC 14, modernize

parent dfb66f13
Loading
Loading
Loading
Loading
+10 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
  desktopToDarwinBundle,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "dsview";

  version = "1.3.2";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "DreamSourceLab";
    repo = "DSView";
    rev = "v${version}";
    rev = "v${finalAttrs.version}";
    sha256 = "sha256-d/TfCuJzAM0WObOiBhgfsTirlvdROrlCm+oL1cqUrIs=";
  };

@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
    ./install.patch
  ];

  # /build/source/libsigrok4DSL/strutil.c:343:19: error: implicit declaration of function 'strcasecmp'; did you mean 'g_strcasecmp'? []
  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";

  nativeBuildInputs = [
    cmake
    pkg-config
@@ -49,15 +52,15 @@ stdenv.mkDerivation rec {
    python3
  ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;

  meta = with lib; {
  meta = {
    description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
    mainProgram = "DSView";
    homepage = "https://www.dreamsourcelab.com/";
    license = licenses.gpl3Plus;
    platforms = platforms.unix;
    maintainers = with maintainers; [
    license = lib.licenses.gpl3Plus;
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [
      bachp
      carlossless
    ];
  };
}
})