Skip to content

Commit 49ca8bc

Browse files
0xda157bachp
authored andcommitted
dsview: unbreak on GCC 14, modernize
1 parent dfb66f1 commit 49ca8bc

File tree

1 file changed

+10
-7
lines changed
  • pkgs/applications/science/electronics/dsview

1 file changed

+10
-7
lines changed

pkgs/applications/science/electronics/dsview/default.nix

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
desktopToDarwinBundle,
1717
}:
1818

19-
stdenv.mkDerivation rec {
19+
stdenv.mkDerivation (finalAttrs: {
2020
pname = "dsview";
2121

2222
version = "1.3.2";
2323

2424
src = fetchFromGitHub {
2525
owner = "DreamSourceLab";
2626
repo = "DSView";
27-
rev = "v${version}";
27+
rev = "v${finalAttrs.version}";
2828
sha256 = "sha256-d/TfCuJzAM0WObOiBhgfsTirlvdROrlCm+oL1cqUrIs=";
2929
};
3030

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

36+
# /build/source/libsigrok4DSL/strutil.c:343:19: error: implicit declaration of function 'strcasecmp'; did you mean 'g_strcasecmp'? []
37+
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
38+
3639
nativeBuildInputs = [
3740
cmake
3841
pkg-config
@@ -49,15 +52,15 @@ stdenv.mkDerivation rec {
4952
python3
5053
] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
5154

52-
meta = with lib; {
55+
meta = {
5356
description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
5457
mainProgram = "DSView";
5558
homepage = "https://www.dreamsourcelab.com/";
56-
license = licenses.gpl3Plus;
57-
platforms = platforms.unix;
58-
maintainers = with maintainers; [
59+
license = lib.licenses.gpl3Plus;
60+
platforms = lib.platforms.unix;
61+
maintainers = with lib.maintainers; [
5962
bachp
6063
carlossless
6164
];
6265
};
63-
}
66+
})

0 commit comments

Comments
 (0)