From 3470fa196d143beab2e7fdd5ba86887126990a4f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 23 Jul 2018 17:18:39 -0400
Subject: scumvm: Don't use crossAttrs

---
 pkgs/games/scummvm/default.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index f4590081898a..b9b95a5fb4dc 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -20,22 +20,16 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  configurePlatforms = [ "host" ];
   configureFlags = [
     "--enable-c++11"
     "--enable-release"
   ];
 
-  crossAttrs = {
-    preConfigure = ''
-      # Remove the --build flag set by the gcc cross wrapper setup
-      # hook
-      export configureFlags="--host=${hostPlatform.config}"
-    '';
-    postConfigure = ''
-      # They use 'install -s', that calls the native strip instead of the cross
-      sed -i 's/-c -s/-c/' ports.mk;
-    '';
-  };
+  # They use 'install -s', that calls the native strip instead of the cross
+  postConfigure = ''
+    sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}" ports.mk
+  '';
 
   meta = with stdenv.lib; {
     description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
-- 
cgit 1.4.1