haskellPackages.{gtk,gio}: Use established workaround
This commit is contained in:
parent
5bd1f315ba
commit
ace41329a5
|
@ -187,10 +187,9 @@ in {
|
|||
haskell-gi-base = __CabalEagerPkgConfigWorkaround super.haskell-gi-base;
|
||||
svgcairo = __CabalEagerPkgConfigWorkaround super.svgcairo;
|
||||
gtk3 = __CabalEagerPkgConfigWorkaround super.gtk3;
|
||||
gio = __CabalEagerPkgConfigWorkaround super.gio;
|
||||
gtk = __CabalEagerPkgConfigWorkaround super.gtk;
|
||||
|
||||
# Cabal 3.8 bug workaround for applications using haskell-gi family of libraries
|
||||
termonad = __CabalEagerPkgConfigWorkaround super.termonad;
|
||||
|
||||
# Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327
|
||||
gtk = doJailbreak super.gtk;
|
||||
}
|
||||
|
|
|
@ -323,18 +323,12 @@ self: super: builtins.intersectAttrs super {
|
|||
gio = lib.pipe super.gio
|
||||
[ (disableHardening ["fortify"])
|
||||
(addBuildTool self.buildHaskellPackages.gtk2hs-buildtools)
|
||||
(addPkgconfigDepends (with pkgs; [ glib pcre2 pcre ]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ]))
|
||||
];
|
||||
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 (
|
||||
[ (disableHardening ["fortify"])
|
||||
(addBuildTool self.buildHaskellPackages.gtk2hs-buildtools)
|
||||
(addPkgconfigDepends (with pkgs; [ gtk2 pcre2 pcre fribidi
|
||||
libthai libdatrie xorg.libXdmcp libdeflate
|
||||
]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ]))
|
||||
] ++
|
||||
( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] )
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue