From c491a99362af31a53d9be6220e268d5b594bae29 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 5 Jul 2018 14:04:52 -0400 Subject: treewide: remove callPackage_i686 This has been replaced with pkgsi686Linux.callPackage --- pkgs/development/pharo/vm/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/development/pharo/vm') diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index e6269503a4c..b995e0e2540 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, callPackage, callPackage_i686, makeWrapper, ...} @pkgs: +{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs: let - i686 = callPackage_i686 ./vms.nix {}; + i686 = pkgsi686Linux.callPackage ./vms.nix {}; native = callPackage ./vms.nix {}; in @@ -11,5 +11,3 @@ rec { spur64 = if stdenv.is64bit then native.spur else "none"; multi-vm-wrapper = callPackage ../wrapper { inherit cog32 spur32 spur64; }; } - - -- cgit 1.4.1