mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 02:42:59 +00:00
Merge pull request #174738 from bjornfor/fix-pulseview
pulseview: hotfix build
This commit is contained in:
commit
39dbb63501
@ -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; };
|
||||||
|
Loading…
Reference in New Issue
Block a user