From 8d5481d01c8ab2840f50f31b88e195b1cc30bd54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 26 May 2022 15:26:50 +0200 Subject: [PATCH] pulseview: hotfix build libsForQt514 uses a custom stdenv that cause breakage when mixed with boost built with normal stdenv. Fix it by building boost with the same stdenv as libsForQt514. This is a dirty fix compared to https://github.com/NixOS/nixpkgs/pull/171380, but without mass rebuilds. --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78d4ca310ee0..abafda662b44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29076,7 +29076,14 @@ with pkgs; 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-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };