From 6bf5e0917ef0c68a1e85c409b12bd689cc0817b2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 1 Sep 2024 12:58:09 +0200 Subject: haskellPackages.sdl2-ttf: move pkg-config override to proper place --- pkgs/development/haskell-modules/configuration-common.nix | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f526895d171b3..23139af6fda2b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2901,7 +2901,6 @@ self: super: { # Workaround for Cabal failing to find nonexistent SDL2 library?! # https://github.com/NixOS/nixpkgs/issues/260863 sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; - sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; # Needs git for compile-time insertion of commit hash into --version string. kmonad = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c03f19c939d0d..d63895d4b343e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1371,6 +1371,7 @@ self: super: builtins.intersectAttrs super { gi-gdk_4_0_8 gi-gsk gi-adwaita + sdl2-ttf ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ -- cgit 1.4.1