From 5979946c41e9b5fd9527eda1724761452d054b42 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 17 Aug 2014 17:07:05 +0200 Subject: [PATCH] chromium: Fix build This works around ld-wrapper's --sysroot filter not working on '@' command lines. Fixes #3642. --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 ++ pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index ffc23a9d968d..daab75c74ff9 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -30,6 +30,8 @@ mkChromiumDerivation (base: rec { done ''; + preHook = "unset NIX_ENFORCE_PURITY"; + meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 311257952712..b9011c0236f3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -108,7 +108,7 @@ let nspr udev (if useOpenSSL then openssl else nss) utillinux alsaLib - gcc bison gperf krb5 + bison gperf krb5 glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage