Skip to content

Commit 658a811

Browse files
sandydoohamishmack
andauthored
Fix missing and replaced packages in 23.11 (#2123)
* Fix missing and replaced packages in 23.11 - Renames `rocm-thunk` to `rocmPackages.rocm-thunk` - Removes `libsigcxx12` * Apply review suggestions * Use `or` operator and fail for gtk stuff * Don't fail fast for missing gtk2 stuff --------- Co-authored-by: Hamish Mackenzie <[email protected]>
1 parent 8be3157 commit 658a811

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

lib/pkgconf-nixpkgs-map.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# See ../docs/tutorials/pkg-map.md
33
pkgs:
44
let
5+
inherit (pkgs) lib;
6+
57
# Only include derivations that exist in the current pkgs.
68
# This allows us to use this mapping to be used in allPkgConfigWrapper.
79
# See ./overlas
@@ -3136,7 +3138,6 @@ pkgs:
31363138
"libstilview" = [ "libsidplayfp" ];
31373139
"libsieve" = [ "libsieve" ];
31383140
"sigc++-2.0" = [ "libsigcxx" ];
3139-
"sigc++-1.2" = [ "libsigcxx12" ];
31403141
"sigc++-3.0" = [ "libsigcxx30" ];
31413142
"libsignal-protocol-c" = [ "libsignal-protocol-c" ];
31423143
"libsignon-glib" = [ "libsignon-glib" ];
@@ -4807,7 +4808,6 @@ pkgs:
48074808
# "gmock" = [ "robo3t" ];
48084809
# "gtest_main" = [ "robo3t" ];
48094810
# "gtest" = [ "robo3t" ];
4810-
"libhsakmt" = [ "rocm-thunk" ];
48114811
"rofi" = [ "rofi" ];
48124812
# "rofi" = [ "rofi-unwrapped" ];
48134813
# "rofi" = [ "rofi-wayland" ];
@@ -5732,4 +5732,9 @@ pkgs:
57325732
else if pkgs ? gdk_pixbuf
57335733
then [ pkgs.gdk_pixbuf ]
57345734
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" ];
57355740
}

0 commit comments

Comments
 (0)