Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6fc744bc84d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d86574b2e75a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 11, 2019

  1. vivaldi: fix build on latest snapshot

    @eadwu
    eadwu committed Oct 11, 2019
    Copy the full SHA
    e2771bf View commit details

Commits on Oct 12, 2019

  1. Merge pull request #70989 from eadwu/vivaldi/fix-latest-snapshot 

    vivaldi: fix build on latest snapshot
    @NeQuissimus
    NeQuissimus authored Oct 12, 2019
    Copy the full SHA
    d86574b View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/applications/networking/browsers/vivaldi/default.nix
3 changes: 1 addition & 2 deletions pkgs/applications/networking/browsers/vivaldi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,8 +82,7 @@ in stdenv.mkDerivation rec {
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
'' + stdenv.lib.optionalString enableWidevine ''
rm $out/opt/${vivaldiName}/libwidevinecdm.so
ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so
ln -sf ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so
'';

meta = with stdenv.lib; {