diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-10-19 16:28:14 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-10-19 16:28:14 +0200 |
commit | cc351a531efde83d88d54dca85b526ec569ad700 (patch) | |
tree | a4ffb1c7b5f2a0c25a5d3a923fe40448732f90b3 | |
parent | ec2d21b4bf5c3f13d6c2093a2ec8106a5bd8f8e5 (diff) |
pkgs/santander: Switch to 32bit build
Right now the linking process with wineg++ fails on 64bit and I currently don't have time to properly look into why this happens. Another workaround would be to just use patchelf to fix the errors afterwards, but in the end everything except dwb has to be 32bit anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-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"; |