diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-02-06 12:44:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-02-06 12:44:34 +0000 |
| commit | e12399051a1e2bdb1a268b415a7590cb2a0b32a6 (patch) | |
| tree | 73c2f625ebe26058d3cb06be6d92c11c6b0e747a | |
| parent | 4d91fa9c45cd344cdc8ff8e10ac4a092305227ab (diff) | |
| download | nixlib-e12399051a1e2bdb1a268b415a7590cb2a0b32a6.tar nixlib-e12399051a1e2bdb1a268b415a7590cb2a0b32a6.tar.gz nixlib-e12399051a1e2bdb1a268b415a7590cb2a0b32a6.tar.bz2 nixlib-e12399051a1e2bdb1a268b415a7590cb2a0b32a6.tar.lz nixlib-e12399051a1e2bdb1a268b415a7590cb2a0b32a6.tar.xz nixlib-e12399051a1e2bdb1a268b415a7590cb2a0b32a6.tar.zst nixlib-e12399051a1e2bdb1a268b415a7590cb2a0b32a6.zip | |
* Grmbl.
svn path=/nixpkgs/trunk/; revision=4738
| -rw-r--r-- | maintainers/docs/todo.txt | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/bzip2/builder-freebsd.sh | 24 | ||||
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 5 |
3 files changed, 30 insertions, 1 deletions
diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt index 463d40decb80..138d1962686e 100644 --- a/maintainers/docs/todo.txt +++ b/maintainers/docs/todo.txt @@ -12,3 +12,5 @@ * Add gettext to glib propagatedBuildInputs? Glib's `gi18n.h' doesn't seem to like Glibc `libintl.h'; needs the gettext one instead. [Move from libbonoboui] + +* Fix the bzip2 build generically. \ No newline at end of file diff --git a/pkgs/tools/compression/bzip2/builder-freebsd.sh b/pkgs/tools/compression/bzip2/builder-freebsd.sh new file mode 100644 index 000000000000..fb5f7ae4250e --- /dev/null +++ b/pkgs/tools/compression/bzip2/builder-freebsd.sh @@ -0,0 +1,24 @@ +source $stdenv/setup +installFlags="PREFIX=$out" + +preBuild=preBuild +preBuild() { + make -f Makefile-libbz2_so +} + +preInstall=preInstall +preInstall() { + ensureDir $out/lib + cp -p libbz2.so* $out/lib + ln -s libbz2.so.*.*.* $out/lib/libbz2.so +} + +postInstall=postInstall +postInstall() { + rm $out/bin/bunzip2 $out/bin/bzcat + ln -s bzip2 $out/bin/bunzip2 + ln -s bzip2 $out/bin/bzcat +} + +genericBuild + diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index ec4ceea1795e..a3e42242096b 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -2,7 +2,10 @@ stdenv.mkDerivation { name = "bzip2-1.0.3"; - builder = if stdenv.system == "powerpc-darwin" then ./builder-darwin.sh else ./builder.sh; + builder = + if stdenv.system == "powerpc-darwin" then ./builder-darwin.sh + if stdenv.system == "i686-freebsd" then ./builder-freebsd.sh + else ./builder.sh; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz; md5 = "8a716bebecb6e647d2e8a29ea5d8447f"; |