Skip to content

Commit

Permalink
FromCabal.Name: fix libsoup attribute names
Browse files Browse the repository at this point in the history
`pkgconfig-depends: libsoup-3.0` was being incorrectly resolved to `libsoup` attribute. Additionally, NixOS/nixpkgs#360908 renamed `libsoup` attribute to `libsoup_2_4`.

Let’s use the correct package attribute names for all libsoup pkg-config files. All libsoup dependent Haskell-packages use `pkgconfig-depends` with one of those names:

https://hackage.haskell.org/package/gi-soup-3.0.3/src/gi-soup.cabal
https://hackage.haskell.org/package/gi-soup-2.4.29/src/gi-soup.cabal
https://hackage.haskell.org/package/spike-0.3/src/spike.cabal
  • Loading branch information
jtojnar authored Dec 4, 2024
1 parent 3948e42 commit a6ee38a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ libNixName "libpcre2-8" = libNixName "libpcre2"
libNixName "libqrencode" = return "qrencode"
libNixName "libR" = return "R"
libNixName "libsecp256k1" = return "secp256k1"
libNixName "libsoup-gnome-2.4" = return "libsoup"
libNixName "libsoup-2.4" = return "libsoup_2_4"
libNixName "libsoup-gnome-2.4" = return "libsoup_2_4"
libNixName "libsoup-3.0" = return "libsoup_3"
libNixName "libsystemd" = return "systemd"
libNixName "libudev" = return "systemd"
libNixName "libxml-2.0" = return "libxml2"
Expand Down

0 comments on commit a6ee38a

Please sign in to comment.