Merge pull request #174738 from bjornfor/fix-pulseview

pulseview: hotfix build
This commit is contained in:
Maximilian Bosch 2022-05-28 00:15:20 +02:00 committed by GitHub
commit 39dbb63501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -29117,7 +29117,14 @@ with pkgs;
pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { }; pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { }; pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview {
# use the same stdenv as libsForQt514 to fix build
boost = boost.override {
stdenv = if stdenv.cc.isGNU
then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
else stdenv;
};
};
puredata = callPackage ../applications/audio/puredata { }; puredata = callPackage ../applications/audio/puredata { };
puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };