From 7d8371a3753780be4d0fdd094be78a4e334532ef Mon Sep 17 00:00:00 2001
From: Vladislav Zavialov <vlad.z.4096@gmail.com>
Date: Fri, 23 Jul 2021 09:32:12 +0300
Subject: [PATCH] Enable SDL

---
 .gitmodules        | 2 +-
 nixpkgs            | 2 +-
 nixpkgs.nix        | 2 +-
 survey/default.nix | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 7b12849..597165b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "nixpkgs"]
 	path = nixpkgs
-	url = https://github.com/nh2/nixpkgs.git
+	url = https://github.com/NixOS/nixpkgs.git
diff --git a/nixpkgs b/nixpkgs
index d00b5a5..95f1154 160000
--- a/nixpkgs
+++ b/nixpkgs
@@ -1 +1 @@
-Subproject commit d00b5a5fa6fe8bdf7005abb06c46ae0245aec8b5
+Subproject commit 95f1154f993bc788bad7df1feed1b98c7e7381cb
diff --git a/nixpkgs.nix b/nixpkgs.nix
index 18eb9c9..01ad304 100644
--- a/nixpkgs.nix
+++ b/nixpkgs.nix
@@ -25,4 +25,4 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
     if builtins.pathExists ./nixpkgs/pkgs
       then import ./nixpkgs {}
       # Pinned nixpkgs version; should be kept up-to-date with our submodule.
-      else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/d00b5a5fa6fe8bdf7005abb06c46ae0245aec8b5.tar.gz) {}
+      else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/95f1154f993bc788bad7df1feed1b98c7e7381cb.tar.gz) {}
diff --git a/survey/default.nix b/survey/default.nix
index 46d8066..590e9b5 100644
--- a/survey/default.nix
+++ b/survey/default.nix
@@ -246,9 +246,6 @@ let
 
   # Stackage package names we want to blacklist.
   blacklist = [
-    # TODO: Try to remove when https://github.com/NixOS/nixpkgs/pull/128746 is available to us
-    "alsa-pcm" "alsa-seq" "ALUT" "OpenAL" "sdl2" "sdl2-gfx" "sdl2-image" "sdl2-mixer" "sdl2-ttf"
-
     # depends on `sbv` -> `openjdk`, which pulls in a huge dependency closure
     "crackNum"