diff options
-rw-r--r-- | pkgs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/santander/default.nix | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 064a6bed..78229945 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,9 @@ { pkgs ? import (import ../nixpkgs-path.nix) {} }: let - callPackage = pkgs.lib.callPackageWith (pkgs // self.vuizvui); + inherit (pkgs.lib) callPackageWith; + callPackage = callPackageWith (pkgs // self.vuizvui); + callPackage_i686 = callPackageWith (pkgs.pkgsi686Linux // self.vuizvui); self.vuizvui = { mkChannel = callPackage ./build-support/channel.nix { }; @@ -24,7 +26,7 @@ let list-gamecontrollers = callPackage ./list-gamecontrollers { }; lockdev = callPackage ./lockdev { }; pvolctrl = callPackage ./pvolctrl { }; - santander = callPackage ./santander { }; + santander = callPackage_i686 ./santander { }; show-qr-code = callPackage ./show-qr-code { }; sidplayfp = callPackage ./sidplayfp { }; tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { }; diff --git a/pkgs/santander/default.nix b/pkgs/santander/default.nix index 7cfd7706..80263897 100644 --- a/pkgs/santander/default.nix +++ b/pkgs/santander/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgsi686Linux, fetchurl, fetchgit, fetchFromBitbucket +{ stdenv, fetchurl, fetchgit, fetchFromBitbucket , runCommand, writeScript, writeScriptBin, writeText -, xvfb_run, xdotool, coreutils, wineMinimal, pipelight, dwb +, xvfb_run, xdotool, coreutils, wineMinimal, pipelight, dwb, pcsclite }: let @@ -15,7 +15,7 @@ let }; patchedWine = let - libpcsclite = "${pkgsi686Linux.pcsclite}/lib/libpcsclite.so"; + libpcsclite = "${pcsclite}/lib/libpcsclite.so"; in (wineMinimal.override { wineBuild = "wine32"; wineRelease = "staging"; |