diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2022-05-25 17:48:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 17:48:07 +0200 |
| commit | f197bd6e34c07573f64c6e32ab6742d809d8067e (patch) | |
| tree | 3586aadd71bbcde7d093ef5227f5c12c46297aa5 /pkgs/development | |
| parent | 5e880240cddf43a67012b8331bfcd2d3a784b1a4 (diff) | |
| parent | 3688fe70f4ddece54a8a468fa90209066675f0e0 (diff) | |
Merge pull request #174371 from NickCao/qt6-alias
qt6: remove all references to aliases
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtbase.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index f5ca3497a242..bf210633fc4f 100644 --- 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 diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 88254ab15890..400fe6aba125 100644 --- 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 = [ |