From 9efbf95d9179702f00bc6d5967284de4d1603028 Mon Sep 17 00:00:00 2001 From: azikx Date: Sun, 20 Oct 2024 11:45:48 +0900 Subject: [PATCH] =?UTF-8?q?update=20=EF=8C=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 171 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 107 insertions(+), 64 deletions(-) diff --git a/flake.nix b/flake.nix index 91fae11..2bae2dc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,89 +1,132 @@ { description = "Zen Browser"; - inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - }; + inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; }; outputs = { self, nixpkgs }: let system = "x86_64-linux"; - version = "1.0.1-a.6"; + version = "1.0.1-a.12"; downloadUrl = { "specific" = { - url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2"; - sha256 = "sha256:0jkzdrsd1qdw3pwdafnl5xb061vryxzgwmvp1a6ghdwgl2dm2fcz"; - }; - "generic" = { - url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-generic.tar.bz2"; - sha256 = "sha256:17c1ayxjdn8c28c5xvj3f94zjyiiwn8fihm3nq440b9dhkg01qcz"; - }; + url = + "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2"; + sha256 = + "sha256:0jkzdrsd1qdw3pwdafnl5xb061vryxzgwmvp1a6ghdwgl2dm2fcz"; + }; + "generic" = { + url = + "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-generic.tar.bz2"; + sha256 = + "sha256:17c1ayxjdn8c28c5xvj3f94zjyiiwn8fihm3nq440b9dhkg01qcz"; + }; }; - pkgs = import nixpkgs { - inherit system; - }; + pkgs = import nixpkgs { inherit system; }; - runtimeLibs = with pkgs; [ - libGL libGLU libevent libffi libjpeg libpng libstartup_notification libvpx libwebp - stdenv.cc.cc fontconfig libxkbcommon zlib freetype - gtk3 libxml2 dbus xcb-util-cursor alsa-lib libpulseaudio pango atk cairo gdk-pixbuf glib - udev libva mesa libnotify cups pciutils - ffmpeg libglvnd pipewire - ] ++ (with pkgs.xorg; [ - libxcb libX11 libXcursor libXrandr libXi libXext libXcomposite libXdamage - libXfixes libXScrnSaver - ]); + runtimeLibs = with pkgs; + [ + libGL + libGLU + libevent + libffi + libjpeg + libpng + libstartup_notification + libvpx + libwebp + stdenv.cc.cc + fontconfig + libxkbcommon + zlib + freetype + gtk3 + libxml2 + dbus + xcb-util-cursor + alsa-lib + libpulseaudio + pango + atk + cairo + gdk-pixbuf + glib + udev + libva + mesa + libnotify + cups + pciutils + ffmpeg + libglvnd + pipewire + ] ++ (with pkgs.xorg; [ + libxcb + libX11 + libXcursor + libXrandr + libXi + libXext + libXcomposite + libXdamage + libXfixes + libXScrnSaver + ]); - mkZen = { variant }: - let - downloadData = downloadUrl."${variant}"; - in - pkgs.stdenv.mkDerivation { - inherit version; - pname = "zen-browser"; + mkZen = { variant }: + let downloadData = downloadUrl."${variant}"; + in pkgs.stdenv.mkDerivation { + inherit version; + pname = "zen-browser"; - src = builtins.fetchTarball { - url = downloadData.url; - sha256 = downloadData.sha256; - }; - - desktopSrc = ./.; + src = builtins.fetchTarball { + url = downloadData.url; + sha256 = downloadData.sha256; + }; - phases = [ "installPhase" "fixupPhase" ]; + desktopSrc = ./.; - nativeBuildInputs = [ pkgs.makeWrapper pkgs.copyDesktopItems pkgs.wrapGAppsHook ] ; + phases = [ "installPhase" "fixupPhase" ]; - installPhase = '' - mkdir -p $out/bin && cp -r $src/* $out/bin - install -D $desktopSrc/zen.desktop $out/share/applications/zen.desktop - install -D $src/browser/chrome/icons/default/default128.png $out/share/icons/hicolor/128x128/apps/zen.png - ''; + nativeBuildInputs = + [ pkgs.makeWrapper pkgs.copyDesktopItems pkgs.wrapGAppsHook ]; - fixupPhase = '' - chmod 755 $out/bin/* - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/zen - wrapProgram $out/bin/zen --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" \ - --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 --set MOZ_APP_LAUNCHER zen --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/zen-bin - wrapProgram $out/bin/zen-bin --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" \ - --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 --set MOZ_APP_LAUNCHER zen --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/glxtest - wrapProgram $out/bin/glxtest --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/updater - wrapProgram $out/bin/updater --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/vaapitest - wrapProgram $out/bin/vaapitest --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" - ''; + installPhase = + " mkdir -p $out/bin && cp -r $src/* $out/bin\n install -D $desktopSrc/zen.desktop $out/share/applications/zen.desktop\n install -D $src/browser/chrome/icons/default/default128.png $out/share/icons/hicolor/128x128/apps/zen.png\n"; - meta.mainProgram = "zen"; - }; - in - { + fixupPhase = '' + chmod 755 $out/bin/* + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/zen + wrapProgram $out/bin/zen --set LD_LIBRARY_PATH "${ + pkgs.lib.makeLibraryPath runtimeLibs + }" \ + --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 --set MOZ_APP_LAUNCHER zen --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/zen-bin + wrapProgram $out/bin/zen-bin --set LD_LIBRARY_PATH "${ + pkgs.lib.makeLibraryPath runtimeLibs + }" \ + --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 --set MOZ_APP_LAUNCHER zen --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/glxtest + wrapProgram $out/bin/glxtest --set LD_LIBRARY_PATH "${ + pkgs.lib.makeLibraryPath runtimeLibs + }" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/updater + wrapProgram $out/bin/updater --set LD_LIBRARY_PATH "${ + pkgs.lib.makeLibraryPath runtimeLibs + }" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/vaapitest + wrapProgram $out/bin/vaapitest --set LD_LIBRARY_PATH "${ + pkgs.lib.makeLibraryPath runtimeLibs + }" + ''; + + meta.mainProgram = "zen"; + }; + in { packages."${system}" = { generic = mkZen { variant = "generic"; }; specific = mkZen { variant = "specific"; }; - default = self.packages."${system}".specific; + default = self.packages."${system}".specific; }; }; }