From 355cb4ce6bbc3f6f238b8a92d61332b2bec753a5 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Sun, 23 Apr 2023 16:21:05 +0300 Subject: [PATCH] haskellPackages.gio: fix build - More addPkgconfigDepends - Tested pkgsets: - [x] .#haskell.packages.ghc92.gio - [x] .#haskell.packages.ghc94.gio --- pkgs/development/haskell-modules/configuration-nix.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 42424065e251..5dba71644c5d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -260,7 +260,11 @@ self: super: builtins.intersectAttrs super { heist = addTestToolDepend pkgs.pandoc super.heist; # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 - gio = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.gio)); + gio = lib.pipe super.gio + [ (disableHardening ["fortify"]) + (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) + (addPkgconfigDepends (with pkgs; [ glib pcre2 util-linux libselinux libsepol pcre ])) + ]; glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib)); gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; }); gtk = lib.pipe super.gtk (