diff options
| -rw-r--r-- | pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/hackage-packages.nix | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index cf4335115863f..8a42a0825aabc 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2022-12-08"; + version = "unstable-2023-01-06"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/021a48f4b4942462154b06fd81429a248638f87f.tar.gz"; - sha256 = "1is1q5mqi86vzy3ni2959hr95gs9hwd5wiz92hanfli3infg00xc"; + url = "https://github.com/NixOS/cabal2nix/archive/d24f4eab2352468510fb81e276aab9d62e94b561.tar.gz"; + sha256 = "16d3mf4d622gns1myx9mwx39sx0l9wndybxn5ik00x0pxnmh7f36"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 00f5458ec3d8e..5037fb8b58d36 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8416,7 +8416,7 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ fuse ]; preConfigure = '' - sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal + sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${lib.getLib fuse}/lib@" HFuse.cabal ''; description = "HFuse is a binding for the Linux FUSE library"; license = lib.licenses.bsd3; @@ -111733,7 +111733,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Cairo bindings"; @@ -112750,7 +112750,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo pango ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Pango bindings"; @@ -112777,7 +112777,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo pango ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "PangoCairo bindings"; @@ -177449,7 +177449,7 @@ self: { version = "0.1.1"; sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi"; configureFlags = [ - "--extra-include-dir=${libxml2.dev}/include/libxml2" + "--extra-include-dir=${lib.getDev libxml2}/include/libxml2" ]; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libxml2 ]; |