From 551d14197601e938d5bb1a7e1ca753525313b9c4 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Mon, 4 Nov 2024 15:51:52 +0700 Subject: [PATCH] chore(nix): Libs for lan-mouse --- .config/nix/flake.lock | 8 ++++---- .config/nix/lib/darwin/libFixup.nix | 10 ++++++++++ .config/nix/systems/darwin/configuration.nix | 15 ++++++++++++++- 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 .config/nix/lib/darwin/libFixup.nix diff --git a/.config/nix/flake.lock b/.config/nix/flake.lock index 5e67baf..40a6056 100644 --- a/.config/nix/flake.lock +++ b/.config/nix/flake.lock @@ -174,17 +174,17 @@ ] }, "locked": { - "lastModified": 1730347751, - "narHash": "sha256-ADGhFqM8hCabAEx2PADy+vi+iynO9aq221PxDZwrhww=", + "lastModified": 1730698801, + "narHash": "sha256-sq68bCmk4tCXSt5CoRNimfigIZSLJSpNi/gjFtNLjRE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "470f87c1827b51169ed4f91cdbdfd48417bfff3d", + "rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0", "type": "github" }, "original": { "owner": "LnL7", "repo": "nix-darwin", - "rev": "470f87c1827b51169ed4f91cdbdfd48417bfff3d", + "rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0", "type": "github" } }, diff --git a/.config/nix/lib/darwin/libFixup.nix b/.config/nix/lib/darwin/libFixup.nix new file mode 100644 index 0000000..70c9f51 --- /dev/null +++ b/.config/nix/lib/darwin/libFixup.nix @@ -0,0 +1,10 @@ +{ package, runCommandLocal, name }: + +runCommandLocal "${name}-symlink" {} + '' + dest="/usr/local/opt/${name}" + + mkdir -p $dest + + ln -sf "${package.out}/lib/" "$dest" && mkdir -p "$out" && touch "$out/${name}-done" + '' diff --git a/.config/nix/systems/darwin/configuration.nix b/.config/nix/systems/darwin/configuration.nix index 62245c3..76a5f37 100644 --- a/.config/nix/systems/darwin/configuration.nix +++ b/.config/nix/systems/darwin/configuration.nix @@ -1,6 +1,8 @@ { pkgs, pkgs-unstable, config, vars, common, inputs, ... }: -{ +let + libFixup = import ../../lib/darwin/libFixup.nix; +in { # I don't want to risk breaking my hackintosh setup in case Apple decided to # turn on auto install by default. system.defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = false; @@ -27,6 +29,17 @@ pkgs.mkalias pkgs.jq + # lan-mouse deps + (libFixup { package = pkgs.libadwaita; inherit (pkgs) runCommandLocal; name = "libadwaita"; }) + (libFixup { package = pkgs.gtk4; inherit (pkgs) runCommandLocal; name = "gtk4"; }) + (libFixup { package = pkgs.pango; inherit (pkgs) runCommandLocal; name = "pango"; }) + (libFixup { package = pkgs.harfbuzz; inherit (pkgs) runCommandLocal; name = "harfbuzz"; }) + (libFixup { package = pkgs.gdk-pixbuf; inherit (pkgs) runCommandLocal; name = "gdk-pixbuf"; }) + (libFixup { package = pkgs.cairo; inherit (pkgs) runCommandLocal; name = "cairo"; }) + (libFixup { package = pkgs.graphene; inherit (pkgs) runCommandLocal; name = "graphene"; }) + (libFixup { package = pkgs.glib; inherit (pkgs) runCommandLocal; name = "glib"; }) + (libFixup { package = pkgs.gettext; inherit (pkgs) runCommandLocal; name = "gettext"; }) + pkgs.pass pkgs.passExtensions.pass-otp pkgs.gnupg