This commit is contained in:
outfoxxed 2026-01-04 00:14:53 -08:00
parent 43d469f225
commit 35a5650988
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
7 changed files with 35 additions and 76 deletions

View file

@ -20,6 +20,8 @@
, lame
, withMusicbrainz ? false
, libmusicbrainz5
, libebur128
, kdePackages
, withTaglib ? true
, taglib
@ -88,8 +90,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nullobsi";
repo = "cantata";
rev = "a19efdf9649c50320f8592f07d82734c352ace9c";
sha256 = "TVqgTYpHyU1OM9XddJ915GM1XQQrhH9V7yhSxQOaXRs=";
rev = "dc5a0ce77cdf3eaacce29180fe7d2c710b3f31af";
sha256 = "YcGqVZuP7slfxo5oe0lBPchVCXm+UsSN/wpglwn6UmU=";
};
patches = [
@ -108,6 +110,9 @@ stdenv.mkDerivation rec {
qtbase
qtsvg
qtwayland
libebur128
kdePackages.kitemviews
kdePackages.karchive
(perl.withPackages (ppkgs: with ppkgs; [ URI ]))
]
++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));

View file

@ -7,6 +7,14 @@
mcontrolcenter = final.callPackage ./mcontrolcenter.nix {};
cantata = final.qt6Packages.callPackage ./cantata {};
tws = final.callPackage ./tws.nix {};
libsigrok = prev.libsigrok.overrideAttrs {
src = pkgs.fetchFromGitHub {
owner = "sipeed";
repo = "libsigrok";
rev = "4bd54163630ab48e3d5cd540ea9e8cf9809c6f3d";
hash = "sha256-Rl5w2jABGTKPnRXZJehNMEBNeGe4POHOoRzffIhAMTM=";
};
};
})
];
}

View file

@ -47,7 +47,7 @@
glib
gtk2
gtk3
javaPackages.openjfx21
javaPackages.openjfx25
libdrm
libGL
libxkbcommon
@ -74,7 +74,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://download2.interactivebrokers.com/installers/tws/latest-standalone/tws-latest-standalone-linux-x64.sh";
hash = "sha256-Wk7lRE5ypJeAQfvi5aEDZYfUF6fJ3ktueYYytHohIGU=";
hash = "sha256-QN7dSe+R2kfDjtJWa9TIGbc8zCSC3XNmxSxOZOjOB2o=";
};
nativeBuildInputs = [