Unverified Commit 63057b5e authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Nix: Remove boost env vars (#417598)

parents fd0c3334 e6165dbd

pkgs/tools/package-management/nix/modular/src/libexpr/package.nix

+0 −7
Original line number Diff line number Diff line
@@ -63,13 +63,6 @@ mkMesonLibrary (finalAttrs: { 
    (lib.mesonEnable "gc" enableGC)

  ];



  env = {

    # Needed for Meson to find Boost.

    # https://github.com/NixOS/nixpkgs/issues/86131.

    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";

    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";

  };



  meta = {

    platforms = lib.platforms.unix ++ lib.platforms.windows;

  };

pkgs/tools/package-management/nix/modular/src/libstore/package.nix

+0 −7
Original line number Diff line number Diff line
@@ -56,13 +56,6 @@ mkMesonLibrary (finalAttrs: { 
      (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")

    ];



  env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {

    # Needed for Meson to find Boost.

    # https://github.com/NixOS/nixpkgs/issues/86131.

    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";

    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";

  };



  meta = {

    platforms = lib.platforms.unix ++ lib.platforms.windows;

  };

pkgs/tools/package-management/nix/modular/src/libutil/package.nix

+0 −7
Original line number Diff line number Diff line
@@ -46,13 +46,6 @@ mkMesonLibrary (finalAttrs: { 
    (lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64)

  ];



  env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {

    # Needed for Meson to find Boost.

    # https://github.com/NixOS/nixpkgs/issues/86131.

    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";

    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";

  };



  meta = {

    platforms = lib.platforms.unix ++ lib.platforms.windows;

  };