nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Merge zlib mac patch.

Browse Source 
svn path=/nixpkgs/trunk/; revision=1445
This commit is contained in:
Eelco Dolstra 2004-09-18 17:58:42 +00:00
parent 1ab4a9324c
commit a801ea32a8
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/zlib-mac-fix/default.nix
View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, patch}:
stdenv.mkDerivation {
name = "zlib-1.2.1";
src = fetchurl {
url = http://www.gzip.org/zlib/zlib-1.2.1.tar.gz;
md5 = "ef1cb003448b4a53517b8f25adb12452";
};
configureFlags = "--shared";
patches = [./darwin.patch];
buildInputs = [patch];
}

0
pkgs/development/libraries/zlib-mac-fix/darwin.patch → pkgs/development/libraries/zlib/darwin.patch
View File

1
pkgs/development/libraries/zlib/default.nix
View File

@ -7,4 +7,5 @@ stdenv.mkDerivation {
md5 = "ef1cb003448b4a53517b8f25adb12452";
};
configureFlags = "--shared";
patches = [./darwin.patch];
}

11
pkgs/system/all-packages-generic.nix
View File

@ -508,14 +508,9 @@ rec {
inherit fetchurl stdenv;
};
zlib = if stdenv.system == "powerpc-darwin" then
(import ../development/libraries/zlib-mac-fix) {
inherit fetchurl stdenv;
}
else
(import ../development/libraries/zlib) {
inherit fetchurl stdenv;
};
zlib = (import ../development/libraries/zlib) {
inherit fetchurl stdenv;
};
libjpeg = (import ../development/libraries/libjpeg) {
inherit fetchurl stdenv;