From a41d0cb6407ba185b78a409ad212a3238fa3d6dd Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 8 Aug 2013 17:52:20 +0200 Subject: [PATCH] chromium: Drop cups_allow_deprecated.patch. It's no longer needed in current Chromium/CUPS versions. Signed-off-by: aszlig --- .../browsers/chromium/cups_allow_deprecated.patch | 14 -------------- .../networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch diff --git a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch b/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch deleted file mode 100644 index 4fd6a24cc143..000000000000 --- a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/printing/printing.gyp b/printing/printing.gyp -index 19fa1b2..f11d76e 100644 ---- a/printing/printing.gyp -+++ b/printing/printing.gyp -@@ -26,6 +26,9 @@ - 'include_dirs': [ - '..', - ], -+ 'cflags': [ -+ '-Wno-deprecated-declarations', -+ ], - 'sources': [ - 'backend/print_backend.cc', - 'backend/print_backend.h', diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index d2c48bc5c7c6..0919f30a7752 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -127,8 +127,7 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - patches = [ userns_patch ] - ++ optional cupsSupport ./cups_allow_deprecated.patch; + patches = [ userns_patch ]; postPatch = '' sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi