public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU MIG: Use `forceSystem' instead of the custom hack. 

svn path=/nixpkgs/trunk/; revision=33121
This commit is contained in:
Ludovic Courtès 2012-03-15 20:27:53 +00:00
parent e4f5ebb348
commit 97bd4b7b00
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/os-specific/gnu/default.nix
View File

@ -3,7 +3,7 @@
args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light , texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
, gccCrossStageStatic, gccCrossStageFinal , gccCrossStageStatic, gccCrossStageFinal
, forceBuildDrv, callPackage, platform, config, crossSystem }: , forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem }:
with args; with args;
@ -72,20 +72,11 @@ rec {
mig = null; mig = null;
}; };
mig = callPackage ./mig mig = callPackage ./mig {
(if stdenv.isLinux # Build natively, but force use of a 32-bit environment because we're
then { # targeting `i586-pc-gnu'.
# Build natively, but force use of a 32-bit environment because we're stdenv = (forceSystem "i686-linux").stdenv;
# targeting `i586-pc-gnu'. };
stdenv = (import ../../stdenv {
system = "i686-linux";
stdenvType = "i686-linux";
allPackages = args:
import ../../top-level/all-packages.nix ({ inherit config; } // args);
inherit platform;
}).stdenv;
}
else { });
smbfs = callPackage ./smbfs { smbfs = callPackage ./smbfs {
samba = samba_light; samba = samba_light;