From 7d70ccdf9fd7f183cc6f10e84ba0b97f98fb522a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 4 Apr 2018 08:08:12 +0200
Subject: pkgs/santander: Use Wine stable instead of staging

The features that we needed back then are now already in stable, so no
need to use staging anymore.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/aszlig/santander/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'pkgs/aszlig')

diff --git a/pkgs/aszlig/santander/default.nix b/pkgs/aszlig/santander/default.nix
index e529cf27..c39d44dc 100644
--- a/pkgs/aszlig/santander/default.nix
+++ b/pkgs/aszlig/santander/default.nix
@@ -1,14 +1,11 @@
-{ stdenv, fetchurl, fetchgit, fetchpatch, runCommand, p7zip, jq, wineMinimal
-, pcsclite
+{ stdenv, lib, fetchurl, fetchgit, fetchpatch, runCommand, p7zip, jq
+, winePackages, pcsclite
 }:
 
 let
   patchedWine = let
     libpcsclite = "${pcsclite}/lib/libpcsclite.so";
-  in (wineMinimal.override {
-    wineBuild = "wine32";
-    wineRelease = "staging";
-  }).overrideDerivation (drv: {
+  in winePackages.minimal.overrideAttrs (drv: {
     scard4wine = fetchgit {
       url = "git://git.code.sf.net/p/scard4wine/code";
       rev = "c14c02c80bf1f2bb4cedd1f53a3a2ab9c48bed76";
@@ -29,7 +26,9 @@ let
       })
     ];
 
-    configureFlags = (drv.configureFlags or []) ++ [ "--disable-unixfs" ];
+    configureFlags = lib.toList (drv.configureFlags or []) ++ [
+      "--disable-unixfs"
+    ];
 
     postConfigure = (drv.postConfigure or "") + ''
       # The wineprefix is within the Nix store, so let's ensure wine doesn't
-- 
cgit 1.4.1