From aba6a3d7f40d193661c20f723414dcd19a7d768d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jul 2018 00:12:38 -0400
Subject: [PATCH] dwarf-fortress: use fetchFromGitHub directly

This avoids creating a second derivation to copy things from the
original. The new themes are now fixed output.
---
 pkgs/games/dwarf-fortress/themes/default.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 90f46d052618..5caaa9e05ca5 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -4,18 +4,12 @@ with builtins;
 
 listToAttrs (map (v: {
   inherit (v) name;
-  value = stdenv.mkDerivation {
+  value = fetchFromGitHub {
     name = "${v.name}-${v.version}";
-    src = fetchFromGitHub {
-      owner = "DFgraphics";
-      repo = v.name;
-      rev = v.version;
-      sha256 = v.sha256;
-    };
-    installPhase = ''
-      mkdir -p $out
-      cp -r data raw $out
-    '';
+    owner = "DFgraphics";
+    repo = v.name;
+    rev = v.version;
+    sha256 = v.sha256;
     meta = with lib; {
       platforms = platforms.all;
       maintainers = [ maintainers.matthewbauer ];