From 70a8422ad0f47679388372ff118b1d02adf0ed07 Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Sat, 23 May 2026 17:59:05 +0100 Subject: [PATCH] brow6el working? --- flake.lock | 6 +++--- hosts/yuhata/packages/brow6el.nix | 34 +++++++++++++++++++++---------- hosts/yure/home.nix | 3 +++ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 2c0d109..a8aa502 100644 --- a/flake.lock +++ b/flake.lock @@ -664,11 +664,11 @@ ] }, "locked": { - "lastModified": 1779488137, - "narHash": "sha256-nWWgKk2Pw7W+ZJYnQmReJU1B51JVdGRcXPDeL61a0Io=", + "lastModified": 1779493674, + "narHash": "sha256-uQB2hksUf5k7yP9Jt+7DEiuKT2Z9clZhYYnShydUqM4=", "owner": "Mop-u", "repo": "sidonia", - "rev": "f5326f30636b4ea21c940df7c607b3a661d45c29", + "rev": "881b548b7fcd7e62018c34702dbe2c115ee09228", "type": "github" }, "original": { diff --git a/hosts/yuhata/packages/brow6el.nix b/hosts/yuhata/packages/brow6el.nix index 974bce6..760374b 100644 --- a/hosts/yuhata/packages/brow6el.nix +++ b/hosts/yuhata/packages/brow6el.nix @@ -2,9 +2,9 @@ lib, stdenv, symlinkJoin, - runCommand, fetchgit, cef-binary, + libx11, libsixel, cmake, pkg-config, @@ -13,20 +13,26 @@ stdenv.mkDerivation ( final: let version = "0.3.4"; - brow6el= fetchgit { + brow6el = fetchgit { url = "https://codeberg.org/janantos/brow6el"; rev = "refs/tags/v${version}"; hash = "sha256-58NlPdTegk+ZXXbNRwN5JdtjmepJoPb0QeZxHz7WNkI="; }; - libcef_dll_wrapper = runCommand "cef-dir" { } '' - mkdir -p $out - cp -r ${cef-binary} $out/cef_binary - cd $out/cef_binary - mkdir -p build - cd build - cmake -DCMAKE_BUILD_TYPE=Release .. - make libcef_dll_wrapper - ''; + libcef_dll_wrapper = stdenv.mkDerivation { + version = cef-binary.version; + pname = "libcef_dll_wrapper"; + src = cef-binary; + nativeBuildInputs = [ cmake ]; + buildPhase = '' + make libcef_dll_wrapper + ''; + installPhase = '' + mkdir -p $out/cef_binary + cp -r ${cef-binary}/. $out/cef_binary + mkdir -p $out/cef_binary/build + cp -r ./ $out/cef_binary/build/ + ''; + }; src = symlinkJoin { name = "brow6el_with_cef"; paths = [ @@ -42,7 +48,13 @@ stdenv.mkDerivation ( nativeBuildInputs = [ cmake pkg-config + libx11 libsixel ]; + cmakeFlags = ["-DCMAKE_SKIP_BUILD_RPATH=ON"]; + installPhase = '' + mkdir -p $out + cp -r ./ $out/ + ''; } ) diff --git a/hosts/yure/home.nix b/hosts/yure/home.nix index 11893bc..519bde9 100644 --- a/hosts/yure/home.nix +++ b/hosts/yure/home.nix @@ -8,6 +8,9 @@ ... }: { + home.packages = [ + # (pkgs.callPackage ../yuhata/packages/brow6el.nix {}) + ]; wayland.windowManager.niri.settings = { layout.default-column-width.proportion = 1.; }; -- 2.54.0