diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-23 17:18:39 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-24 17:51:20 -0400 |
| commit | 3470fa196d143beab2e7fdd5ba86887126990a4f (patch) | |
| tree | b3ebd0ddf695a5854aabf368a10493262d542d85 /pkgs/games/scummvm | |
| parent | aa8944f40393a8cdbd92a247adb5ab84a3bcc8af (diff) | |
| download | nixpkgs-3470fa196d143beab2e7fdd5ba86887126990a4f.tar nixpkgs-3470fa196d143beab2e7fdd5ba86887126990a4f.tar.gz nixpkgs-3470fa196d143beab2e7fdd5ba86887126990a4f.tar.bz2 nixpkgs-3470fa196d143beab2e7fdd5ba86887126990a4f.tar.lz nixpkgs-3470fa196d143beab2e7fdd5ba86887126990a4f.tar.xz nixpkgs-3470fa196d143beab2e7fdd5ba86887126990a4f.tar.zst nixpkgs-3470fa196d143beab2e7fdd5ba86887126990a4f.zip | |
scumvm: Don't use crossAttrs
Diffstat (limited to 'pkgs/games/scummvm')
| -rw-r--r-- | pkgs/games/scummvm/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index f4590081898..b9b95a5fb4d 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)"; |