nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-18 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247575 from lorenz/dsview-1-3-0

Browse Source 
dsview: 1.2.2 -> 1.3.0
This commit is contained in:
Pascal Bach 2023-08-14 13:31:47 +02:00 committed by GitHub
commit 1f546bd2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/science/electronics/dsview/default.nix
View File

@ -1,18 +1,18 @@
{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake
, libzip, boost, fftw, qtbase, libusb1
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook
, libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1
, python3, fetchpatch
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "dsview";
version = "1.2.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "DreamSourceLab";
repo = "DSView";
rev = "v${version}";
sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q=";
sha256 = "sha256-wnBVhZ3Ky9PXs48OVvSbD1aAUSEqAwaNLg7Ntim7yFM=";
};
patches = [
@ -20,10 +20,10 @@ mkDerivation rec {
./install.patch
];
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [
boost fftw qtbase libusb1 libzip
boost fftw qtbase qtwayland qtsvg libusb1 libzip
python3
];

2
pkgs/top-level/all-packages.nix
View File

@ -7442,7 +7442,7 @@ with pkgs;
dropbear = callPackage ../tools/networking/dropbear { };
dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { };
dtach = callPackage ../tools/misc/dtach { };