From cde3f1cadacfe853b1afe6429300d16b15aa367b Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 23 Jun 2024 18:21:43 +0300 Subject: [PATCH] treewide: Remove now unnecessary boost vars `meson` now finds `boost` using `pkg-config` --- pkgs/applications/audio/pulseeffects-legacy/default.nix | 5 ----- pkgs/applications/misc/tuxclocker/default.nix | 4 ---- pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix | 2 +- pkgs/by-name/tu/tuxclocker-plugins/package.nix | 2 +- pkgs/development/interpreters/emilua/default.nix | 7 ------- pkgs/development/libraries/cairomm/1.16.nix | 5 ----- pkgs/development/libraries/cairomm/default.nix | 5 ----- pkgs/tools/package-management/lix/common.nix | 7 ------- 8 files changed, 2 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix index 1fb71e05d2f2..744b5f0cd4ce 100644 --- a/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -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; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; mainProgram = "pulseeffects"; diff --git a/pkgs/applications/misc/tuxclocker/default.nix b/pkgs/applications/misc/tuxclocker/default.nix index 7a47e571cee0..8f1cdde3d703 100644 --- a/pkgs/applications/misc/tuxclocker/default.nix +++ b/pkgs/applications/misc/tuxclocker/default.nix @@ -27,10 +27,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0="; }; - # Meson doesn't find boost without these - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - nativeBuildInputs = [ git makeWrapper diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix index b783953acd93..714eb8752a4c 100644 --- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { pname = "tuxclocker-nvidia-plugin"; - inherit (tuxclocker-plugins) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR nativeBuildInputs; + inherit (tuxclocker-plugins) src version meta nativeBuildInputs; buildInputs = [ boost diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix index 12deedd5c56f..0504b163f7c9 100644 --- a/pkgs/by-name/tu/tuxclocker-plugins/package.nix +++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation { - inherit (tuxclocker) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR; + inherit (tuxclocker) src version meta; pname = "tuxclocker-plugins"; diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 396164b14a89..4ef35441d344 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -71,13 +71,6 @@ stdenv.mkDerivation rec { 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 = [ (lib.mesonBool "enable_file_io" true) (lib.mesonBool "enable_io_uring" true) diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix index 9da00741c34e..83428f0fef9b 100644 --- a/pkgs/development/libraries/cairomm/1.16.nix +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { "-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. doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index d8d908cbc40d..957cfa26ac73 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { "-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; meta = with lib; { diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 8c89cf9fefda..b01b381d1491 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -203,13 +203,6 @@ stdenv.mkDerivation { (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 = '' mkdir -p $doc/nix-support