diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-01-05 18:47:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 18:47:21 +0000 |
| commit | 1f6bb81b06a0e5511153404ffd68ac5acc636cd3 (patch) | |
| tree | d5ff0053be52a9179929a61ffe760e1463055277 /pkgs | |
| parent | efb6c30d109a35168fb82021f16f67fd8f6d7441 (diff) | |
| parent | 1181bdd7175a5e2e137dd5f33336a6826b91a468 (diff) | |
| download | nixpkgs-1f6bb81b06a0e5511153404ffd68ac5acc636cd3.tar nixpkgs-1f6bb81b06a0e5511153404ffd68ac5acc636cd3.tar.gz nixpkgs-1f6bb81b06a0e5511153404ffd68ac5acc636cd3.tar.bz2 nixpkgs-1f6bb81b06a0e5511153404ffd68ac5acc636cd3.tar.lz nixpkgs-1f6bb81b06a0e5511153404ffd68ac5acc636cd3.tar.xz nixpkgs-1f6bb81b06a0e5511153404ffd68ac5acc636cd3.tar.zst nixpkgs-1f6bb81b06a0e5511153404ffd68ac5acc636cd3.zip | |
Merge pull request #21679 from volth/chromium-command-line-args
chromium, google-chrome: add commandLineArgs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/google-chrome/default.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1556603db2c..d014999a667 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,6 +12,7 @@ , enableWideVine ? false , cupsSupport ? true , pulseSupport ? false +, commandLineArgs ? "" }: let @@ -76,6 +77,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ + ${commandLineArgs} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 938dbe09ebe..abc314f8569 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -6,6 +6,9 @@ , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus_libs, gtk2, gdk_pixbuf, gcc +# command line arguments which are always set e.g "--disable-gpu" +, commandLineArgs ? "" + # Will crash without. , systemd @@ -106,7 +109,7 @@ in stdenv.mkDerivation rec { #!${bash}/bin/sh export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} export PATH=$binpath\''${PATH:+:\$PATH} - $out/share/google/$appname/google-$appname "\$@" + $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@" EOF chmod +x $exe |