Unverified Commit f8d5b22d authored by Emily's avatar Emily Committed by GitHub
Browse files

mkKdeDerivation: do not use stdenv from `qt6Packages` (#371466)

parents 418f69e8 fee4f9b2

pkgs/kde/default.nix

+4 −5
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ let 
      ) allUrls;

    in

    (

      qt6Packages

      # This removes reference to deprecated `qt6Packages.stdenv`

      # so when a KDE package asks for a stdenv, it won't trigger

      # an eval warning

      (lib.removeAttrs qt6Packages [ "stdenv" ])

      // frameworks

      // gear

      // plasma
@@ -66,10 +69,6 @@ let 
        # Alias because it's just data

        plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;



        # Alias because `self.callPackage` would give deprecated

        # `qt6Packages.stdenv` when asked for `stdenv`

        inherit stdenv;



        selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub



        alpaka = self.callPackage ./misc/alpaka { };

pkgs/top-level/qt6-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -126,5 +126,6 @@ makeScopeWithSplicing' { 
  xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };

  });

} // lib.optionalAttrs config.allowAliases {

  # when removing, don't forget to remove a workaround in `pkgs/kde/default.nix`

  stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05

}