dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

haskellPackages.gio: fix build

Browse Source 
- More addPkgconfigDepends
- Tested pkgsets:
  - [x] .#haskell.packages.ghc92.gio
  - [x] .#haskell.packages.ghc94.gio
This commit is contained in:
Miao, ZhiCheng 2023-04-23 16:21:05 +03:00
parent 77fb04d83e
commit 355cb4ce6b
No known key found for this signature in database
GPG Key ID: 1080B4863AD0F5D1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -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 (