diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
| commit | 215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch) | |
| tree | f31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/tools/misc | |
| parent | b31c67e24d56c90a6732d3a310ff13684b73e200 (diff) | |
| parent | 4e3dcd925499547314567107366cae26a99c4ef7 (diff) | |
| download | nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2 nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip | |
svn merge ^/nixpkgs/trunk
Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/cowsay/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 7 |
2 files changed, 23 insertions, 2 deletions
diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix new file mode 100644 index 000000000000..59978e2865cb --- /dev/null +++ b/pkgs/tools/misc/cowsay/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { + name = "cowsay-3.03"; + src = fetchurl { + url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; + sha256 = "1bxj802na2si2bk5zh7n0b7c33mg8a5n2wnvh0vihl9bmjkp51hb"; + }; + buildInputs = [perl]; + installPhase = '' + bash ./install.sh $out + ''; + + meta = { + description = "cowsay is a program which generates ASCII pictures of a cow with a message."; + homepage = http://www.nog.net/~tony/warez/cowsay.shtml; + }; +} diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 9402fad22870..ad2820012dbd 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -5,7 +5,7 @@ }: let - version = "20090408"; + version = "20110222"; name = "fontforge-${version}"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fontforge/fontforge_full-${version}.tar.bz2"; - sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4"; + sha256 = "0gj342iyd2qmza523r84m65fm7bymcfd4lbllywbfjzq4s0838lg"; }; configureFlags = lib.optionalString withX11 "--with-gui=gdraw"; @@ -28,6 +28,9 @@ stdenv.mkDerivation { --replace /usr/include /no-such-path \ --replace /usr/lib /no-such-path \ --replace /usr/local /no-such-path \ + + + export NIX_LDFLAGS="$NIX_LDFLAGS -lz" ''; buildInputs = |