Skip to content
Snippets Groups Projects
Commit 6e48a1fa authored by Daniel Firth's avatar Daniel Firth
Browse files

fix sdl2-packages

parent d4c55385
Branches
2 merge requests!20ghc 9.6.x updates,!16sdl2-{gfx, image, mixer, ttf}: init
......@@ -8,7 +8,32 @@ final: prev: {
persistent-qq = null;
sdl2-gfx = pkgs.haskellPackages.sdl2-gfx;
sdl2-gfx = addSetupDepends
(overrideCabal prev.sdl2-gfx
{ __onlyPropagateKnownPkgConfigModules = true; }
)
[ pkgs.pkg-config pkgs.SDL2 ];
sdl2-image =
addSetupDepends
(overrideCabal prev.sdl2-image
{ __onlyPropagateKnownPkgConfigModules = true; }
)
[ pkgs.pkg-config pkgs.SDL2 pkgs.libtiff pkgs.libwebp ];
sdl2-mixer =
addSetupDepends
(overrideCabal prev.sdl2-mixer
{ __onlyPropagateKnownPkgConfigModules = true; }
)
[ pkgs.pkg-config pkgs.SDL2 pkgs.libsndfile pkgs.libpulseaudio pkgs.alsa-lib pkgs.jack2 pkgs.glib pkgs.pcre2 ];
sdl2-ttf =
addSetupDepends
(overrideCabal prev.sdl2-ttf
{ __onlyPropagateKnownPkgConfigModules = true; }
)
[ pkgs.pkg-config pkgs.SDL2 pkgs.SDL2_ttf pkgs.harfbuzz pkgs.freetype pkgs.glib pkgs.pcre2 ];
zlib = prev.callPackage ./pkgs/zlib.nix { inherit (pkgs) zlib; };
}
......
......@@ -192,17 +192,17 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1690244517,
"narHash": "sha256-85HKKTzXygAcYLqgkNZw0rmtC1MBAcINpplraESqbuI=",
"lastModified": 1697059129,
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "500b36d057ceaa7ad3e2e282958a44ed607b021f",
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "500b36d057ceaa7ad3e2e282958a44ed607b021f",
"type": "github"
}
},
......
......@@ -10,7 +10,7 @@
horizon-core.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-core";
flake-utils.url = "github:numtide/flake-utils";
lint-utils.url = "git+https://gitlab.nixica.dev/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs?rev=500b36d057ceaa7ad3e2e282958a44ed607b021f";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs =
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment