diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-17 17:20:30 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-17 17:20:30 +0000 |
commit | 776bedbb5fca600a20a89b1d6e02e54f11b30c63 (patch) | |
tree | 36033e3e6c26042b23a5a0b3ecd3f36a57ebd399 /pkgs/applications/networking/mailreaders | |
parent | f0925eeded71deb7ce48fcafdcba3ba5a7a014a5 (diff) |
Remove some files not reachable from all-packages.nix
List of removed files: * pkgs/applications/misc/kiwixbuilder/default.nix * pkgs/applications/misc/simgrid/default.nix * pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix * pkgs/applications/networking/mailreaders/thunderbird/7.x.nix * pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch * pkgs/development/libraries/bluez-libs/default.nix * pkgs/development/libraries/libjingle/0.4.0.nix * pkgs/development/perl-modules/Font-TTF/default.nix * pkgs/tools/X11/xauth/default.nix * pkgs/tools/security/p0f/default.nix * pkgs/tools/security/p0f/p0f.patch svn path=/nixpkgs/trunk/; revision=33205
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
-rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/7.x.nix | 96 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch | 21 |
2 files changed, 0 insertions, 117 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix deleted file mode 100644 index fb84271787c07..0000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL -, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss -, libnotify, cairo, pixman, fontconfig - -, # If you want the resulting program to call itself "Thunderbird" - # instead of "Shredder", enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false - -}: - -let version = "7.0.1"; in - -stdenv.mkDerivation { - name = "thunderbird-${version}"; - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5"; - }; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify - libnotify cairo pixman fontconfig yasm mesa /* nss */ - ]; - - patches = [ - # Fix weird dependencies such as a so file which depends on "-lpthread". - ./thunderbird-build-deps.patch - ]; - - NIX_LDFLAGS = "-lpixman-1"; - - configureFlags = - [ "--enable-application=mail" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - # "--with-system-bz2" - "--with-system-nspr" - "--enable-system-cairo" - "--disable-crashreporter" - "--disable-necko-wifi" - "--disable-tests" - "--enable-calendar" - ] - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # The Thunderbird Makefiles refer to the variables LIBXUL_DIST, - # prefix, and PREFIX in some places where they are not set. In - # particular, there are some linker flags like - # `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to - # `-rpath-link=/bin', the build fails due to the purity checks in - # the ld wrapper. So disable the purity check for now. - preBuild = "NIX_ENFORCE_PURITY=0"; - - # This doesn't work: - #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)"; - - postInstall = - '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/lib/thunderbird-*/thunderbird \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Create a desktop item. - mkdir -p $out/share/applications - cat > $out/share/applications/thunderbird.desktop <<EOF - [Desktop Entry] - Type=Application - Exec=$out/bin/thunderbird - Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png - Name=Thunderbird - GenericName=Mail Reader - Categories=Application;Network; - EOF - ''; - - meta = with stdenv.lib; { - description = "Mozilla Thunderbird, a full-featured email client"; - homepage = http://www.mozilla.org/thunderbird/; - license = - # Official branding implies thunderbird name and logo cannot be reuse, - # see http://www.mozilla.org/foundation/licensing.html - if enableOfficialBranding then licenses.proprietary else licenses.mpl11; - maintainers = with maintainers; [ pierron ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch b/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch deleted file mode 100644 index ac074e8c88129..0000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -x _inst -x _build -x .svn -ur comm-miramar/config/rules.mk comm-miramar.after/config/rules.mk ---- comm-miramar/config/rules.mk 2011-06-24 22:13:31.000000000 +0200 -+++ comm-miramar/config/rules.mk 2011-08-15 12:27:07.305556040 +0200 -@@ -851,9 +851,13 @@ - - ifndef _LIBNAME_RELATIVE_PATHS - --LIBS_DEPS += $(filter -l%, $(LIBS)) --HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS)) --DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS)) -+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(LIBS)))) -+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(HOST_LIBS)))) -+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(EXTRA_DSO_LDOPTS)))) -+ -+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(LIBS))) -+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(HOST_LIBS))) -+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(EXTRA_DSO_LDOPTS))) - - _LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS))) - ifneq (,$(_LIBDIRS)) -Seulement dans comm-miramar.after/config: rules.mk~ |