nixpkgs/pkgs
aszlig 61042a5b6a
chromium/plugins: Use @var@ for passing variables
There is already a pull request from @colemickens, who has just reversed
the variable references $flash and $flashVersion but the fix is kinda
fragile as he points out himself in #12713.

The reason the wrong substition was made is that both variables begin
with the same name and we do a simple replace instead of a more
complicated one using builtins.match.

So staying simple but to still not raising issues with other variables
that begin with the same name I'm now using @var@ instead, like we use
in substituteAll and other substituters (like the ones in CMake or
autotools) deal with it.

Note that I'm not using $var$ here to make sure it doesn't get confused
with real shell variables.

So with this fix in place, the wrapper now has the following flags:

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=20.0.0.294

Previously we had (#12710):

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=/nix/store/...-binary-plugins-flashVersion

Thanks to @colemickens for reporting and putting up a pull request.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12710
Fixes: #12713
2016-02-02 17:39:08 +01:00
..
applications chromium/plugins: Use @var@ for passing variables 2016-02-02 17:39:08 +01:00
build-support fetchgitlocal: be less chatty 2016-02-01 10:57:01 -08:00
data Merge pull request #12701 from mayflower/builder-def-cleanup 2016-02-01 21:09:34 +00:00
desktops gnome3.geocode-glib: 3.18.0 -> 3.18.1 2016-02-02 10:27:26 +01:00
development cargo: 0.7.0 -> 0.8.0 2016-02-02 17:25:44 +01:00
games Merge pull request #12562 from tvestelind/vassal 2016-02-01 23:56:12 +01:00
misc wine unstable: 1.9.1 -> 1.9.2 (close #12730) 2016-02-02 05:56:13 +01:00
os-specific linux: Update to 3.10.96, 3.12.53, 3.14.60, 3.18.26, 4.1.17, 4.4.1 2016-02-02 16:38:42 +01:00
servers quagga: init at 0.99.24.1 2016-02-02 11:56:30 +02:00
shells fish: don't use manpath(1) from PATH in functions/man.fish 2016-02-02 06:13:12 +01:00
stdenv Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
test
tools Merge pull request #12755 from mstarzyk/obnam 2016-02-02 16:47:59 +01:00
top-level rustRegistry: 2016-01-17 -> 2016-02-02 2016-02-02 17:25:44 +01:00