diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-17 17:07:05 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-17 17:08:21 +0200 |
| commit | 5979946c41e9b5fd9527eda1724761452d054b42 (patch) | |
| tree | 8817c2038d6f3507ae89e01090955cf0a011b084 /pkgs/applications | |
| parent | 1d996821fb833dcf3f9bfafdde67bc04ee12503a (diff) | |
| download | nixpkgs-5979946c41e9b5fd9527eda1724761452d054b42.tar nixpkgs-5979946c41e9b5fd9527eda1724761452d054b42.tar.gz nixpkgs-5979946c41e9b5fd9527eda1724761452d054b42.tar.bz2 nixpkgs-5979946c41e9b5fd9527eda1724761452d054b42.tar.lz nixpkgs-5979946c41e9b5fd9527eda1724761452d054b42.tar.xz nixpkgs-5979946c41e9b5fd9527eda1724761452d054b42.tar.zst nixpkgs-5979946c41e9b5fd9527eda1724761452d054b42.zip | |
chromium: Fix build
This works around ld-wrapper's --sysroot filter not working on '@' command lines. Fixes #3642.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index ffc23a9d968..daab75c74ff 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 31125795271..b9011c0236f 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 |