mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
* Mac needs Unzip 5.52.
svn path=/nixpkgs/trunk/; revision=2434
This commit is contained in:
parent
b13b00afe2
commit
55a02efa5b
@ -10,3 +10,5 @@
|
|||||||
|
|
||||||
* After building gcc, filter out references to /tmp/nix... in
|
* After building gcc, filter out references to /tmp/nix... in
|
||||||
.../lib/libsupc++.la and .../lib/libstdc++.la
|
.../lib/libsupc++.la and .../lib/libstdc++.la
|
||||||
|
|
||||||
|
* Consolidate unzip-5.52.
|
||||||
|
@ -94,6 +94,10 @@ rec {
|
|||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
unzip552 = (import ../tools/archivers/unzip-5.52) {
|
||||||
|
inherit fetchurl stdenv;
|
||||||
|
};
|
||||||
|
|
||||||
gzip = (import ../tools/compression/gzip) {
|
gzip = (import ../tools/compression/gzip) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
@ -92,13 +92,23 @@ let {
|
|||||||
;};
|
;};
|
||||||
|
|
||||||
powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
|
powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
|
||||||
|
unzip552
|
||||||
aterm
|
aterm
|
||||||
subversion
|
subversion
|
||||||
|
bisonnew
|
||||||
|
flexnew
|
||||||
|
libxml2
|
||||||
|
libxslt
|
||||||
|
docbook_xml_dtd_42
|
||||||
|
docbook_xml_dtd_43
|
||||||
|
docbook_xml_ebnf_dtd
|
||||||
|
docbook_xml_xslt
|
||||||
|
nxml
|
||||||
;};
|
;};
|
||||||
|
|
||||||
|
|
||||||
body = [
|
body = [
|
||||||
i686LinuxPkgs
|
i686LinuxPkgs
|
||||||
# powerpcDarwinPkgs
|
powerpcDarwinPkgs
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
# (essentially it's just the native environment).
|
# (essentially it's just the native environment).
|
||||||
stdenvDarwin = (import ../stdenv/darwin) {
|
stdenvDarwin = (import ../stdenv/darwin) {
|
||||||
stdenv = stdenvInitial;
|
stdenv = stdenvInitial;
|
||||||
genericStdenv = import ../stdenv/generic-branch;
|
genericStdenv = import ../stdenv/generic;
|
||||||
inherit gccWrapper;
|
inherit gccWrapper;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
14
pkgs/tools/archivers/unzip-5.52/builder.sh
Normal file
14
pkgs/tools/archivers/unzip-5.52/builder.sh
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
. $stdenv/setup
|
||||||
|
|
||||||
|
builder() {
|
||||||
|
make -f unix/Makefile generic
|
||||||
|
}
|
||||||
|
|
||||||
|
installer() {
|
||||||
|
make -f unix/Makefile prefix=$out install
|
||||||
|
}
|
||||||
|
|
||||||
|
buildPhase=builder
|
||||||
|
installPhase=installer
|
||||||
|
|
||||||
|
genericBuild
|
10
pkgs/tools/archivers/unzip-5.52/default.nix
Normal file
10
pkgs/tools/archivers/unzip-5.52/default.nix
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "unzip-5.52";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz;
|
||||||
|
md5 = "9d23919999d6eac9217d1f41472034a9";
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user