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

Fixes to support the new stdenvType

Browse Source 
svn path=/nixpkgs/trunk/; revision=6242
This commit is contained in:
Martin Bravenboer 2006-08-25 20:58:02 +00:00
parent 3402fe7c80
commit f0129a3f44
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/aterm/aterm-2.4.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
}; };
patches = patches =
[./aterm-alias-fix-2.patch] ++ [./aterm-alias-fix-2.patch] ++
(if stdenv.system == "i686-mingw" then [./mingw-asm.patch] else []); (if stdenv ? isMinGW && stdenv.isMinGW then [./mingw-asm.patch] else []);
meta = { meta = {
homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
license = "LGPL"; license = "LGPL";

1
pkgs/stdenv/mingw/default.nix
View File

@ -80,6 +80,7 @@ let {
shell = msysShell; shell = msysShell;
inherit curl; inherit curl;
isDarwin = false; isDarwin = false;
isMinGW = true;
}; };
mkDerivationFun = { mkDerivationFun = {

5
pkgs/top-level/mingw.nix
View File

@ -1,10 +1,11 @@
let { let {
pkgs = pkgs =
import ./all-packages.nix { import ./all-packages.nix {
system = "i686-mingw"; stdenvType = "i686-mingw";
}; };
body = { body = {
inherit (pkgs) zlib getopt realCurl aterm; inherit (pkgs) zlib getopt realCurl aterm pkgconfig_latest;
inherit (pkgs.gtkLibs28) glib;
}; };
} }