nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Remove now unnecessary boost vars

Browse Source 
`meson` now finds `boost` using `pkg-config`
This commit is contained in:
Artturin 2024-06-23 18:21:43 +03:00 committed by Alyssa Ross
parent 821841dd87
commit cde3f1cada
8 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/audio/pulseeffects-legacy/default.nix
View File

@ -99,11 +99,6 @@ in stdenv.mkDerivation rec {
) )
''; '';
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
meta = with lib; { meta = with lib; {
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
mainProgram = "pulseeffects"; mainProgram = "pulseeffects";

4
pkgs/applications/misc/tuxclocker/default.nix
View File

@ -27,10 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0="; hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0=";
}; };
# Meson doesn't find boost without these
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
nativeBuildInputs = [ nativeBuildInputs = [
git git
makeWrapper makeWrapper

2
pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
View File

@ -11,7 +11,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "tuxclocker-nvidia-plugin"; pname = "tuxclocker-nvidia-plugin";
inherit (tuxclocker-plugins) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR nativeBuildInputs; inherit (tuxclocker-plugins) src version meta nativeBuildInputs;
buildInputs = [ buildInputs = [
boost boost

2
pkgs/by-name/tu/tuxclocker-plugins/package.nix
View File

@ -13,7 +13,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (tuxclocker) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR; inherit (tuxclocker) src version meta;
pname = "tuxclocker-plugins"; pname = "tuxclocker-plugins";

7
pkgs/development/interpreters/emilua/default.nix
View File

@ -71,13 +71,6 @@ stdenv.mkDerivation rec {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
env = {
BOOST_INCLUDEDIR = "${lib.getDev boost182}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib";
};
mesonFlags = [ mesonFlags = [
(lib.mesonBool "enable_file_io" true) (lib.mesonBool "enable_file_io" true)
(lib.mesonBool "enable_io_uring" true) (lib.mesonBool "enable_io_uring" true)

5
pkgs/development/libraries/cairomm/1.16.nix
View File

@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
"-Dbuild-tests=true" "-Dbuild-tests=true"
]; ];
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
# Tests fail on Darwin, possibly because of sandboxing. # Tests fail on Darwin, possibly because of sandboxing.
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;

5
pkgs/development/libraries/cairomm/default.nix
View File

@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
"-Dbuild-tests=true" "-Dbuild-tests=true"
]; ];
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
meta = with lib; { meta = with lib; {

7
pkgs/tools/package-management/lix/common.nix
View File

@ -203,13 +203,6 @@ stdenv.mkDerivation {
(lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
]; ];
# Needed for Meson to find Boost.
# https://github.com/NixOS/nixpkgs/issues/86131.
env = {
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
};
postInstall = postInstall =
'' ''
mkdir -p $doc/nix-support mkdir -p $doc/nix-support