dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #21679 from volth/chromium-command-line-args

Browse Source 
chromium, google-chrome: add commandLineArgs
This commit is contained in:
Michael Raskin 2017-01-05 18:47:21 +00:00 committed by GitHub
commit 1f6bb81b06
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -12,6 +12,7 @@
, enableWideVine ? false , enableWideVine ? false
, cupsSupport ? true , cupsSupport ? true
, pulseSupport ? false , pulseSupport ? false
, commandLineArgs ? ""
}: }:
let let
@ -76,6 +77,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin" mkdir -p "$out/bin"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
${commandLineArgs} \
${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
ed -v -s "$out/bin/chromium" << EOF ed -v -s "$out/bin/chromium" << EOF

5
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -6,6 +6,9 @@
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus_libs, gtk2, gdk_pixbuf, gcc , dbus_libs, gtk2, gdk_pixbuf, gcc
# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""
# Will crash without. # Will crash without.
, systemd , systemd
@ -106,7 +109,7 @@ in stdenv.mkDerivation rec {
#!${bash}/bin/sh #!${bash}/bin/sh
export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=$binpath\''${PATH:+:\$PATH} export PATH=$binpath\''${PATH:+:\$PATH}
$out/share/google/$appname/google-$appname "\$@" $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
EOF EOF
chmod +x $exe chmod +x $exe