commit c6fc73b5bc8ba185c4466d79173d534275f2aa9d · pyrox.dev/nixpkgs

lib/maintainers.nix

···

       314
       314
        
         lihop = "Leroy Hopson <nixos@leroy.geek.nz>";

     

       315
       315
        
         linquize = "Linquize <linquize@yahoo.com.hk>";

     

       316
       316
        
         linus = "Linus Arver <linusarver@gmail.com>";

     

       317
       317
       +
         lluchs = "Lukas Werling <lukas.werling@gmail.com>";

     

       317
       318
        
         lnl7 = "Daiderd Jordan <daiderd@gmail.com>";

     

       318
       319
        
         loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>";

     

       319
       320
        
         lovek323 = "Jason O'Conal <jason@oconal.id.au>";

+12 -5

pkgs/applications/networking/browsers/vivaldi/default.nix

···

       6
       6
        
       , gstreamer, gst-plugins-base, libxml2

     

       7
       7
        
       , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3

     

       8
       8
        
       , nss, nspr

     

       9
       9
       -
       , patchelf

     

       9
       9
       +
       , patchelf, makeWrapper

     

       10
       10
       +
       , proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       stdenv.mkDerivation rec {

     

       13
       14
        
         name = "${product}-${version}";

     

       14
       15
        
         product = "vivaldi";

     

       15
       15
       -
         version = "1.10.867.38-1";

     

       16
       16
       +
         version = "1.10.867.48-1";

     

       16
       17
        
       

     

       17
       18
        
         src = fetchurl {

     

       18
       19
        
           url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";

     

       19
       19
       -
           sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi";

     

       20
       20
       +
           sha256 = "1han45swvv0y2i2kg7xhml1wj5zyrf2c2hc5b07kqsjkfg9iz1lc";

     

       20
       21
        
         };

     

       21
       22
        
       

     

       22
       23
        
         unpackPhase = ''

     
···

       24
       25
        
           tar -xvf data.tar.xz

     

       25
       26
        
         '';

     

       26
       27
        
       

     

       27
       27
       -
         nativeBuildInputs = [ patchelf ];

     

       28
       28
       +
         nativeBuildInputs = [ patchelf makeWrapper ];

     

       28
       29
        
       

     

       29
       30
        
         buildInputs = [

     

       30
       31
        
           stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb

     
···

       32
       33
        
           atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd

     

       33
       34
        
           freetype fontconfig libXrender libuuid expat glib nss nspr

     

       34
       35
        
           gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf

     

       35
       35
       -
         ];

     

       36
       36
       +
         ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

     

       36
       37
        
       

     

       37
       38
        
         libPath = stdenv.lib.makeLibraryPath buildInputs

     

       38
       39
        
           + stdenv.lib.optionalString (stdenv.is64bit)

     
···

       45
       46
        
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       46
       47
        
             --set-rpath "${libPath}" \

     

       47
       48
        
             opt/vivaldi/vivaldi-bin

     

       49
       49
       +
         '' + stdenv.lib.optionalString proprietaryCodecs ''

     

       50
       50
       +
           sed -i '/^VIVALDI_FFMPEG_FOUND/ a \

     

       51
       51
       +
           checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/vivaldi/vivaldi

     

       52
       52
       +
         '' + ''

     

       48
       53
        
           echo "Finished patching Vivaldi binaries"

     

       49
       54
        
         '';

     

       50
       55
        
       

     
···

       67
       72
        
               "$out"/opt/vivaldi/product_logo_''${d}.png \

     

       68
       73
        
               "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png

     

       69
       74
        
           done

     

       75
       75
       +
           wrapProgram "$out/bin/vivaldi" \

     

       76
       76
       +
             --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/

     

       70
       77
        
         '';

     

       71
       78
        
       

     

       72
       79
        
         meta = with stdenv.lib; {

+51

pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix

···

       1
       1
       +
       { stdenv, fetchurl, fetchpatch

     

       2
       2
       +
       , dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss

     

       3
       3
       +
       , pciutils, pkgconfig, python2, xdg_utils

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         name = "${product}-${version}";

     

       8
       8
       +
         product = "vivaldi-ffmpeg-codecs";

     

       9
       9
       +
         version = "59.0.3071.104";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchurl {

     

       12
       12
       +
           url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";

     

       13
       13
       +
           sha512 = "419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ ];

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [

     

       19
       19
       +
           dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig

     

       20
       20
       +
           python2 xdg_utils

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         configurePhase = ''

     

       24
       24
       +
           runHook preConfigure

     

       25
       25
       +
       

     

       26
       26
       +
           local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false is_clang=false is_component_build=true is_debug=false symbol_level=0"

     

       27
       27
       +
           python tools/gn/bootstrap/bootstrap.py -v -s --no-clean --gn-gen-args "$args"

     

       28
       28
       +
           out/Release/gn gen out/Release -v --args="$args"

     

       29
       29
       +
       

     

       30
       30
       +
           runHook postConfigure

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         buildPhase = ''

     

       34
       34
       +
           ninja -C out/Release -v libffmpeg.so

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         dontStrip = true;

     

       38
       38
       +
       

     

       39
       39
       +
         installPhase = ''

     

       40
       40
       +
           mkdir -p "$out/lib"

     

       41
       41
       +
           cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so"

     

       42
       42
       +
         '';

     

       43
       43
       +
       

     

       44
       44
       +
         meta = with stdenv.lib; {

     

       45
       45
       +
           description = "Additional support for proprietary codecs for Vivaldi";

     

       46
       46
       +
           homepage    = "https://ffmpeg.org/";

     

       47
       47
       +
           license     = licenses.lgpl21;

     

       48
       48
       +
           maintainers = with maintainers; [ lluchs ];

     

       49
       49
       +
           platforms   = [ "x86_64-linux" ];

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+38

pkgs/applications/networking/browsers/vivaldi/update.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p libarchive curl common-updater-scripts

     

       3
       3
       +
       

     

       4
       4
       +
       set -eu -o pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       cd "$(dirname "${BASH_SOURCE[0]}")"

     

       7
       7
       +
       root=../../../../..

     

       8
       8
       +
       export NIXPKGS_ALLOW_UNFREE=1

     

       9
       9
       +
       

     

       10
       10
       +
       version() {

     

       11
       11
       +
       	(cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')

     

       12
       12
       +
       }

     

       13
       13
       +
       

     

       14
       14
       +
       vivaldi_version_old=$(version vivaldi)

     

       15
       15
       +
       vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p')

     

       16
       16
       +
       

     

       17
       17
       +
       if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then

     

       18
       18
       +
       	echo "nothing to do, vivaldi $vivaldi_version is current"

     

       19
       19
       +
       	exit

     

       20
       20
       +
       fi

     

       21
       21
       +
       

     

       22
       22
       +
       # Download vivaldi and save hash and file path.

     

       23
       23
       +
       url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb"

     

       24
       24
       +
       mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")

     

       25
       25
       +
       hash=${prefetch[0]}

     

       26
       26
       +
       path=${prefetch[1]}

     

       27
       27
       +
       

     

       28
       28
       +
       echo "vivaldi: $vivaldi_version_old -> $vivaldi_version"

     

       29
       29
       +
       (cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash")

     

       30
       30
       +
       

     

       31
       31
       +
       # Check vivaldi-ffmpeg-codecs version.

     

       32
       32
       +
       chromium_version_old=$(version vivaldi-ffmpeg-codecs)

     

       33
       33
       +
       chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep -A2 -i '^chrome\/' | grep '^[0-9]\+\.[0-9]\+\.[1-9][0-9]\+\.[0-9]\+')

     

       34
       34
       +
       

     

       35
       35
       +
       if [[ "$chromium_version" != "$chromium_version_old" ]]; then

     

       36
       36
       +
       	echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version"

     

       37
       37
       +
       	(cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version")

     

       38
       38
       +
       fi

pkgs/top-level/all-packages.nix

···

       15532
       15532
        
       

     

       15533
       15533
        
         vivaldi = callPackage ../applications/networking/browsers/vivaldi {};

     

       15534
       15534
        
       

     

       15535
       15535
       +
         vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};

     

       15536
       15536
       +
       

     

       15535
       15537
        
         openmpt123 = callPackage ../applications/audio/openmpt123 {};

     

       15536
       15538
        
       

     

       15537
       15539
        
         opusfile = callPackage ../applications/audio/opusfile { };