Skip to content

Commit 7d8371a

Browse files
committed
Enable SDL
1 parent bd66b86 commit 7d8371a

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "nixpkgs"]
22
path = nixpkgs
3-
url = https://github.com/nh2/nixpkgs.git
3+
url = https://github.com/NixOS/nixpkgs.git

nixpkgs

Submodule nixpkgs updated 2549 files

nixpkgs.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
2525
if builtins.pathExists ./nixpkgs/pkgs
2626
then import ./nixpkgs {}
2727
# Pinned nixpkgs version; should be kept up-to-date with our submodule.
28-
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/d00b5a5fa6fe8bdf7005abb06c46ae0245aec8b5.tar.gz) {}
28+
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/95f1154f993bc788bad7df1feed1b98c7e7381cb.tar.gz) {}

survey/default.nix

-3
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,6 @@ let
246246

247247
# Stackage package names we want to blacklist.
248248
blacklist = [
249-
# TODO: Try to remove when https://github.com/NixOS/nixpkgs/pull/128746 is available to us
250-
"alsa-pcm" "alsa-seq" "ALUT" "OpenAL" "sdl2" "sdl2-gfx" "sdl2-image" "sdl2-mixer" "sdl2-ttf"
251-
252249
# depends on `sbv` -> `openjdk`, which pulls in a huge dependency closure
253250
"crackNum"
254251

0 commit comments

Comments
 (0)