* Remove a bunch of unused Nix expressions.
svn path=/nixpkgs/trunk/; revision=6716
This commit is contained in:
@@ -1,7 +0,0 @@
|
||||
{stdenv, fetchurl}: stdenv.mkDerivation {
|
||||
name = "freetype-2.2.1";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/freetype-2.2.1.tar.bz2;
|
||||
md5 = "5b2f827082c544392a7701f7423f0781";
|
||||
};
|
||||
}
|
||||
@@ -8,4 +8,6 @@ stdenv.mkDerivation {
|
||||
|
||||
# TODO: maybe this package as dependency on gnome-themes?
|
||||
configureFlags = "--disable-hicolor-check";
|
||||
|
||||
patches = [./gnome-icon-theme-2.14.2.patch];
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:
|
||||
|
||||
assert pkgconfig != null && perl != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (input) name src;
|
||||
buildInputs = [pkgconfig perl perlXMLParser];
|
||||
|
||||
# TODO: maybe this package as dependency on gnome-themes?
|
||||
configureFlags = "--disable-hicolor-check";
|
||||
|
||||
patches = [./gnome-icon-theme-2.14.2.patch];
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, glib, pango, libart, libxml2, popt, bison, flex}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (input) name src;
|
||||
|
||||
buildInputs = [
|
||||
perl perlXMLParser pkgconfig popt libxml2
|
||||
glib pango bison flex
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [libxml2 libart];
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{stdenv, fetchurl, zlib}:
|
||||
|
||||
assert zlib != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libpng-1.2.12";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/libpng-1.2.12.tar.bz2;
|
||||
md5 = "2287cfaad53a714acdf6eb75a7c1d15f";
|
||||
};
|
||||
propagatedBuildInputs = [zlib];
|
||||
inherit zlib;
|
||||
}
|
||||
@@ -1 +1,20 @@
|
||||
import ./libxml2-2.6.26.nix
|
||||
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
|
||||
|
||||
assert zlib != null;
|
||||
assert pythonSupport -> python != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxml2-2.6.26";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.gz;
|
||||
md5 = "2d8d3805041edab967368b497642f981";
|
||||
};
|
||||
|
||||
python = if pythonSupport then python else null;
|
||||
inherit pythonSupport zlib;
|
||||
|
||||
buildInputs = if pythonSupport then [python] else [];
|
||||
propagatedBuildInputs = [zlib];
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
|
||||
|
||||
assert zlib != null;
|
||||
assert pythonSupport -> python != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxml2-2.6.23";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.23.tar.gz;
|
||||
md5 = "0f37385e3ad73cc94db43d6873f4fc3b";
|
||||
};
|
||||
|
||||
python = if pythonSupport then python else null;
|
||||
inherit pythonSupport zlib;
|
||||
|
||||
buildInputs = if pythonSupport then [python] else [];
|
||||
propagatedBuildInputs = [zlib];
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
|
||||
|
||||
assert zlib != null;
|
||||
assert pythonSupport -> python != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxml2-2.6.26";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.gz;
|
||||
md5 = "2d8d3805041edab967368b497642f981";
|
||||
};
|
||||
|
||||
python = if pythonSupport then python else null;
|
||||
inherit pythonSupport zlib;
|
||||
|
||||
buildInputs = if pythonSupport then [python] else [];
|
||||
propagatedBuildInputs = [zlib];
|
||||
}
|
||||
@@ -1 +1,12 @@
|
||||
import ./libxslt-1.1.15.nix
|
||||
{stdenv, fetchurl, libxml2}:
|
||||
|
||||
assert libxml2 != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxslt-1.1.17";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.17.tar.gz;
|
||||
md5 = "fde6a7a93c0eb14cba628692fa3a1000";
|
||||
};
|
||||
buildInputs = [libxml2];
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
{stdenv, fetchurl, libxml2}:
|
||||
|
||||
assert libxml2 != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxslt-1.1.15";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.15.tar.gz;
|
||||
md5 = "238de9eda71b570ff7b78aaf65308fc6";
|
||||
};
|
||||
buildInputs = [libxml2];
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{stdenv, fetchurl, libxml2}:
|
||||
|
||||
assert libxml2 != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxslt-1.1.17";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.17.tar.gz;
|
||||
md5 = "fde6a7a93c0eb14cba628692fa3a1000";
|
||||
};
|
||||
buildInputs = [libxml2];
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
{stdenv, fetchurl, libxml2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "neon-0.24.7";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/neon-0.24.7.tar.gz;
|
||||
md5 = "5108bcbe41de4afe2e19cc58500fb9f2";
|
||||
};
|
||||
buildInputs = [libxml2];
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
{stdenv, fetchurl, libxml2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "neon-0.26.1";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/neon-0.26.1.tar.gz;
|
||||
md5 = "3bb7a82bddfc1c56d2f9dba849aecd1f";
|
||||
};
|
||||
buildInputs = [libxml2];
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
configureScript=./config
|
||||
configureFlags=shared
|
||||
|
||||
postInstall=postInstall
|
||||
postInstall() {
|
||||
# Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
|
||||
chmod 755 $out/lib/pkgconfig || exit 1
|
||||
}
|
||||
|
||||
genericBuild
|
||||
@@ -1,13 +0,0 @@
|
||||
{stdenv, fetchurl, perl}: stdenv.mkDerivation {
|
||||
name = "openssl-0.9.8";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/openssl-0.9.8.tar.gz;
|
||||
md5 = "9da21071596a124acde6080552deac16";
|
||||
};
|
||||
buildInputs = [perl];
|
||||
|
||||
# Quick fix for a Makefile bug in openssl-0.9.8 (`make install'
|
||||
# tries to copy .so files, instead of .dylib files).
|
||||
patches = if stdenv.isDarwin then [./dylib.patch] else [];
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
diff -rc openssl-0.9.8-orig/engines/Makefile openssl-0.9.8/engines/Makefile
|
||||
*** openssl-0.9.8-orig/engines/Makefile 2005-06-28 11:10:18.000000000 +0200
|
||||
--- openssl-0.9.8/engines/Makefile 2005-07-13 13:19:09.000000000 +0200
|
||||
***************
|
||||
*** 91,102 ****
|
||||
for l in $(LIBNAMES); do \
|
||||
( echo installing $$l; \
|
||||
if [ "$(PLATFORM)" != "Cygwin" ]; then \
|
||||
! cp lib$$l.so $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
|
||||
else \
|
||||
! cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
|
||||
fi; \
|
||||
! chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
|
||||
! mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so ); \
|
||||
done; \
|
||||
fi
|
||||
|
||||
--- 91,102 ----
|
||||
for l in $(LIBNAMES); do \
|
||||
( echo installing $$l; \
|
||||
if [ "$(PLATFORM)" != "Cygwin" ]; then \
|
||||
! cp lib$$l.dylib $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \
|
||||
else \
|
||||
! cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \
|
||||
fi; \
|
||||
! chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \
|
||||
! mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib ); \
|
||||
done; \
|
||||
fi
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
(import ../../../../pkgs/system/i686-linux.nix).toolbuslib
|
||||
Reference in New Issue
Block a user