Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
horizon-advance
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
package-sets
horizon-advance
Commits
6e48a1fa
Commit
6e48a1fa
authored
1 year ago
by
Daniel Firth
Browse files
Options
Downloads
Patches
Plain Diff
fix sdl2-packages
parent
d4c55385
Branches
Branches containing commit
2 merge requests
!20
ghc 9.6.x updates
,
!16
sdl2-{gfx, image, mixer, ttf}: init
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configuration.nix
+26
-1
26 additions, 1 deletion
configuration.nix
flake.lock
+4
-4
4 additions, 4 deletions
flake.lock
flake.nix
+1
-1
1 addition, 1 deletion
flake.nix
with
31 additions
and
6 deletions
configuration.nix
+
26
−
1
View file @
6e48a1fa
...
...
@@ -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
;
};
}
...
...
This diff is collapsed.
Click to expand it.
flake.lock
+
4
−
4
View file @
6e48a1fa
...
...
@@ -192,17 +192,17 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 169
0244517
,
"narHash": "sha256-
85HKKTzXygAcYLqgkNZw0rmtC1MBAcINpplraESqbuI
=",
"lastModified": 169
7059129
,
"narHash": "sha256-
9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0
=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5
00b36d057ceaa7ad3e2e282958a44ed607b021f
",
"rev": "5
e4c2ada4fcd54b99d56d7bd62f384511a7e2593
",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "500b36d057ceaa7ad3e2e282958a44ed607b021f",
"type": "github"
}
},
...
...
This diff is collapsed.
Click to expand it.
flake.nix
+
1
−
1
View file @
6e48a1fa
...
...
@@ -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
=
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment