|
2 | 2 | # See ../docs/tutorials/pkg-map.md
|
3 | 3 | pkgs:
|
4 | 4 | let
|
| 5 | + inherit (pkgs) lib; |
| 6 | + |
5 | 7 | # Only include derivations that exist in the current pkgs.
|
6 | 8 | # This allows us to use this mapping to be used in allPkgConfigWrapper.
|
7 | 9 | # See ./overlas
|
@@ -3136,7 +3138,6 @@ pkgs:
|
3136 | 3138 | "libstilview" = [ "libsidplayfp" ];
|
3137 | 3139 | "libsieve" = [ "libsieve" ];
|
3138 | 3140 | "sigc++-2.0" = [ "libsigcxx" ];
|
3139 |
| - "sigc++-1.2" = [ "libsigcxx12" ]; |
3140 | 3141 | "sigc++-3.0" = [ "libsigcxx30" ];
|
3141 | 3142 | "libsignal-protocol-c" = [ "libsignal-protocol-c" ];
|
3142 | 3143 | "libsignon-glib" = [ "libsignon-glib" ];
|
@@ -4807,7 +4808,6 @@ pkgs:
|
4807 | 4808 | # "gmock" = [ "robo3t" ];
|
4808 | 4809 | # "gtest_main" = [ "robo3t" ];
|
4809 | 4810 | # "gtest" = [ "robo3t" ];
|
4810 |
| - "libhsakmt" = [ "rocm-thunk" ]; |
4811 | 4811 | "rofi" = [ "rofi" ];
|
4812 | 4812 | # "rofi" = [ "rofi-unwrapped" ];
|
4813 | 4813 | # "rofi" = [ "rofi-wayland" ];
|
@@ -5732,4 +5732,9 @@ pkgs:
|
5732 | 5732 | else if pkgs ? gdk_pixbuf
|
5733 | 5733 | then [ pkgs.gdk_pixbuf ]
|
5734 | 5734 | else [];
|
| 5735 | + # rocm-thunk was replaced by rocmPackages.rocm-thunk in 23.11 |
| 5736 | + "libhsakmt" = [ pkgs.rocmPackages.rocm-thunk or pkgs.rocm-thunk ]; |
| 5737 | +} // lib.optionalAttrs (pkgs ? libsigcxx12) { |
| 5738 | + # libsigcxx12 was removed in 23.11 |
| 5739 | + "sigc++-1.2" = [ "libsigcxx12" ]; |
5735 | 5740 | }
|
0 commit comments