Merge pull request #174371 from NickCao/qt6-alias

qt6: remove all references to aliases
2022-05-25 17:48:07 +02:00 · 2022-05-25 17:48:07 +02:00 · f197bd6e34
commit f197bd6e34
parent 5e880240cd 3688fe70f4
2 changed files with 4 additions and 4 deletions
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@ -37,7 +37,7 @@
 , libdrm
 , libdatrie
 , lttng-ust
-, epoxy
+, libepoxy
 , libiconv
 , dbus
 , fontconfig
@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
    xorg.libXdmcp
    xorg.libXtst
    xorg.xcbutilcursor
-    epoxy
+    libepoxy
  ] ++ (with unixODBCDrivers; [
    psql
    sqlite
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
@ -63,7 +63,7 @@
 , libxslt
 , lcms2
 , re2
-, kerberos
+, libkrb5
 , enableProprietaryCodecs ? true
 }:

@ -215,7 +215,7 @@ qtModule rec {
    # Pipewire
    pipewire

-    kerberos
+    libkrb5
  ];

  buildInputs = [