diff --git a/dotfiles/dot_config/fish/functions/nixgc.fish b/dotfiles/dot_config/fish/functions/nixgc.fish index 8d39ebd..791137f 100644 --- a/dotfiles/dot_config/fish/functions/nixgc.fish +++ b/dotfiles/dot_config/fish/functions/nixgc.fish @@ -1,5 +1,5 @@ #!/usr/bin/env fish function nixgc --description 'update home manager' - sudo nix-collect-garbage $argv + nix-collect-garbage $argv && sudo nix-collect-garbage $argv end diff --git a/dotfiles/dot_sbclrc b/dotfiles/dot_sbclrc index 66848ec..c712e56 100644 --- a/dotfiles/dot_sbclrc +++ b/dotfiles/dot_sbclrc @@ -7,7 +7,7 @@ (when (probe-file quicklisp-init) (load quicklisp-init))) -;; (push (pathname "~/quicklisp/") ql:*local-project-directories*) +(push (pathname "~/source/_cl") ql:*local-project-directories*) (ql:quickload :cffi :silent t) (pushnew (merge-pathnames ".nix-profile/lib/" (user-homedir-pathname)) diff --git a/flake.lock b/flake.lock index bcb7ebf..31d5c78 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1732466619, - "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3111f62a23451114433888902a55cf0692b408d", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733066523, + "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732824227, - "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { @@ -190,11 +190,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732824227, - "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 292fe7a..110daa6 100644 --- a/home/home.nix +++ b/home/home.nix @@ -289,7 +289,7 @@ (callPackage ../packages/amplocker/package.nix {}) (callPackage ../packages/chair-audio/snare.nix {}) (callPackage ../packages/chair-audio/cymb.nix {}) - (callPackage ../packages/u-he/twangstrom.nix {}) + # (callPackage ../packages/u-he/twangstrom.nix {}) # Fonts fira-code diff --git a/packages/u-he/twangstrom.nix b/packages/u-he/twangstrom.nix index 67f894c..30e7758 100644 --- a/packages/u-he/twangstrom.nix +++ b/packages/u-he/twangstrom.nix @@ -1,13 +1,16 @@ { stdenv, pkgs, fetchurl, lib, autoPatchelfHook, makeWrapper, ... }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "u-he twangstrom"; version = "latest"; + src = fetchurl { url = "https://dl.u-he.com/releases/Twangstrom_102_16742_Linux.tar.xz"; sha256 = "sha256-SFPY+R+gQstDXe+gLaoIuCUckBoYwWZygXSMwytcpnc="; }; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = with pkgs; [ freetype fontconfig @@ -18,20 +21,32 @@ stdenv.mkDerivation { xorg.libxcb xorg.xcbutilkeysyms xorg.xcbutil + gtk3 + glibc + batik ]; installPhase = '' - mkdir -p $out/lib/vst $out/lib/vst3 $out/lib/clap $out/lib/vst3/Twangstrom.vst3/Contents/Resources/Documentation $out/lib/vst3/Twangstrom.vst3/Contents/x86_64-linux $out/lib/vst3/Twangstrom.vst3/Contents/i686-linux + mkdir -p $out/lib/vst3 $out/share $out/lib/vst3/Twangstrom.64.vst3/Contents/Resources/Documentation $out/lib/vst3/Twangstrom.64.vst3/Contents/x86_64-linux - cp -r Twangstrom/Twangstrom.64.so $out/lib/vst/ + cp -r Twangstrom/Twangstrom.64.so $out/lib/vst3/Twangstrom.64.vst3/Contents/x86_64-linux/ + cp -r Twangstrom/*.pdf $out/lib/vst3/Twangstrom.64.vst3/Contents/Resources/Documentation/ - cp -r Twangstrom/Twangstrom.64.so $out/lib/vst3/Twangstrom.vst3/Contents/x86_64-linux/ - cp -r Twangstrom/*.pdf $out/lib/vst3/Twangstrom.vst3/Contents/Resources/Documentation/ + ''; + + # cp -r Twangstrom $out/share/ + + postFixup = '' + for file in \ + $out/lib/vst3/Twangstrom.64.vst3/Contents/x86_64-linux/Twangstrom.64.so + do + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $file + done ''; meta = with lib; { homepage = "https://u-he.com/products/twangstrom/"; - description = "u-he twangstrom"; + description = "u-he twangstrom. To complete the installation, manually symlink the data dirs from ~/.nix-profile/share/Twangstrom/ into ~/.u-he/Twangstrom/"; platforms = platforms.linux; }; }