Skip to content

Commit a6ee38a

Browse files
authored
FromCabal.Name: fix libsoup attribute names
`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
1 parent 3948e42 commit a6ee38a

File tree

1 file changed

+3
-1
lines changed
  • cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal

1 file changed

+3
-1
lines changed

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ libNixName "libpcre2-8" = libNixName "libpcre2"
120120
libNixName "libqrencode" = return "qrencode"
121121
libNixName "libR" = return "R"
122122
libNixName "libsecp256k1" = return "secp256k1"
123-
libNixName "libsoup-gnome-2.4" = return "libsoup"
123+
libNixName "libsoup-2.4" = return "libsoup_2_4"
124+
libNixName "libsoup-gnome-2.4" = return "libsoup_2_4"
125+
libNixName "libsoup-3.0" = return "libsoup_3"
124126
libNixName "libsystemd" = return "systemd"
125127
libNixName "libudev" = return "systemd"
126128
libNixName "libxml-2.0" = return "libxml2"

0 commit comments

Comments
 (0)