diff --git a/home-manager/fred.nix b/home-manager/fred.nix index b3276d8..3a7535c 100644 --- a/home-manager/fred.nix +++ b/home-manager/fred.nix @@ -54,15 +54,18 @@ in # Wrap codium so user-installed extension native addons (.node files from # npm) can find libstdc++.so.6 — those binaries have empty RPATHs and # Electron's patched interpreter won't pick up nix-ld's stubs. - package = pkgs.symlinkJoin { - name = "vscodium"; - paths = [ pkgs.vscodium ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/codium \ - --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc.lib ]}" - ''; - }; + # The `// { pname; version }` forwards those attrs so programs.vscode's + # module (which reads cfg.package.pname) can still identify the variant. + package = + let base = pkgs.symlinkJoin { + name = "vscodium"; + paths = [ pkgs.vscodium ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/codium \ + --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc.lib ]}" + ''; + }; in base // { inherit (pkgs.vscodium) pname version; }; mutableExtensionsDir = true; profiles.default.userSettings = { "window.menuBarVisibility" = "compact";