jiebi/CodeConvo huggingface dataset:
<ins> { lib, stdenvNoCC, fetchFromGitHub, gitUpdater, gnome-themes-extra, gtk-engine-murrine, jdupes, sassc, themeVariants ? [ ], # default: blue colorVariants ? [ ], # default: all sizeVariants ? [ ], # default: standard tweaks ? [ ], }: let pname = "fluent-gtk-theme"; in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks stdenvNoCC.mkDerivation (finalAttrs: { inherit pname; version = "2024-06-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "fluent-gtk-theme"; rev = finalAttrs.version; hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0="; }; nativeBuildInputs = [ jdupes sassc ]; buildInputs = [ gnome-themes-extra ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; postPatch = '' patchShebangs install.sh ''; installPhase = '' runHook preInstall name= HOME="$TMPDIR" ./install.sh  ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants}  ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants}  ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants}  ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks}  --icon nixos  --dest $out/share/themes jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; passthru.updateScript = gitUpdater { }; meta = { description = "Fluent design gtk theme"; changelog = "https://github.com/vinceliuice/Fluent-gtk-theme/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ luftmensch-luftmensch romildo ]; }; }) </ins>
<del> { lib , stdenvNoCC , fetchFromGitHub , gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes , sassc , themeVariants ? [] # default: blue , colorVariants ? [] # default: all , sizeVariants ? [] # default: standard , tweaks ? [] }: let pname = "fluent-gtk-theme"; in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks stdenvNoCC.mkDerivation (finalAttrs: { inherit pname; version = "2024-04-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "fluent-gtk-theme"; rev = finalAttrs.version; hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs="; }; nativeBuildInputs = [ jdupes sassc ]; buildInputs = [ gnome-themes-extra ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; postPatch = '' patchShebangs install.sh ''; installPhase = '' runHook preInstall name= HOME="$TMPDIR" ./install.sh  ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants}  ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants}  ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants}  ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks}  --icon nixos  --dest $out/share/themes jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; passthru.updateScript = gitUpdater { }; meta = { description = "Fluent design gtk theme"; homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ romildo ]; }; }) </del>
flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; <del> fluent-gtk-theme = callPackage ../data/themes/fluent-gtk-theme { }; </del> fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4;
platforms = []; source = { remotes = ["https://rubygems.org"]; <del> sha256 = "sha256-CQioY4HZ+XOCRoDfTgp1QidmJy8DscDknbfnnCPbETU="; </del> <ins> sha256 = "0428ady49qssmnmwnafzrjvyba8mzbridsgblv7c7kmd0vqgfn99"; </ins> type = "gem"; }; <del> version = "3.2.8"; </del> <ins> version = "3.3.0"; </ins> }; rmagick = { dependencies = ["observer" "pkg-config"];
"@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt"; aws-cdk = "cdk"; <del> bash-language-server = "bash-language-server"; </del> cdk8s-cli = "cdk8s"; cdktf-cli = "cdktf"; clipboard-cli = "clipboard";
bypassCache = true; reconstructLock = true; }; <del> bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; version = "5.3.4"; src = fetchurl { url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.3.4.tgz"; sha512 = "9GEzJVOOyU7ZQbDI/uFc8N9FGuun6UZv1qB9bNUbehIb1gA4pOpkIYtqtfSq0XQSO25hMp8d/tzsmFJmeX+dQg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."braces-3.0.3" sources."domino-2.1.6" sources."encoding-0.1.13" sources."fast-glob-3.3.2" sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."fuzzy-search-3.2.1" sources."glob-parent-5.1.2" sources."iconv-lite-0.6.3" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.7" sources."node-fetch-2.7.0" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."turndown-7.1.3" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.2" sources."web-tree-sitter-0.22.5" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."zod-3.22.4" ]; buildInputs = globalBuildInputs; meta = { description = "A language server for Bash"; homepage = "https://github.com/bash-lsp/bash-language-server#readme"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; </del> bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower";
}; }; <del> bash-language-server = prev.bash-language-server.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/bash-language-server"  --prefix PATH : ${lib.makeBinPath [ pkgs.shellcheck ]} ''; }; </del> bower2nix = prev.bower2nix.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = ''
allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree <del> version = "115.12.0"; </del> <ins> version = "115.13.0"; </ins> src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; <del> hash = "sha256-9EDTVckSqv/nyDi4qjMd54I69WiqM8v6om7zQLT+pQc="; </del> <ins> hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; </ins> }; extraConfigureFlags = [
"--with-unsigned-addon-scopes=app,system" ]; <ins> extraPostPatch = '' # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin # https://github.com/NixOS/nixpkgs/issues/314115 substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs  --replace-fail /usr/bin/floorp floorp ''; </ins> updateScript = ./update.sh; meta = {
<ins> diff --git a/src/config.hpp b/src/config.hpp index 6e7439b..ae01462 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -4,8 +4,6 @@ Runtime configuration can be disabled by deleting #define RUNTIME_CONFIG */ -#define RUNTIME_CONFIG - // Current								Default inline bool starthidden = false;		// false inline bool searchbar = true;			// true </ins>
<ins> diff --git a/Makefile b/Makefile index f0b6baf..71033a5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SRCS +=	$(wildcard src/*.cpp) OBJS = $(SRCS:.cpp=.o) DESTDIR = $(HOME)/.local -CXXFLAGS = -march=native -mtune=native -Os -s -Wall -flto=auto -fno-exceptions +CXXFLAGS = -Os -s -Wall -flto=auto -fno-exceptions CXXFLAGS += $(shell pkg-config --cflags $(PKGS)) LDFLAGS += $(shell pkg-config --libs $(PKGS)) -Wl,--gc-sections </ins>
<ins> { stdenv, lib, fetchFromGitHub, pkg-config, git, gtkmm4, gtk4-layer-shell, wrapGAppsHook4, unstableGitUpdater, }: stdenv.mkDerivation { pname = "sysmenu"; version = "unstable-2024-06-13"; src = fetchFromGitHub { owner = "System64fumo"; repo = "sysmenu"; rev = "0b891e5d27f286b867d4a0984ee284a3456de851"; hash = "sha256-zI6dmS+ZqcGrG/joWouqrMNQfTRflP677kYJLJEWTBc="; }; patches = [ ./001-no-runtime-config.patch ./002-cflags-fix.patch ]; nativeBuildInputs = [ pkg-config git wrapGAppsHook4 ]; buildInputs = [ gtkmm4 gtk4-layer-shell ]; installPhase = '' runHook preInstall install -Dm755 sysmenu $out/bin/sysmenu runHook postInstall ''; passthru.updateScript = unstableGitUpdater { }; meta = { description = "Simple program launcher using GTK4"; homepage = "https://github.com/System64fumo/sysmenu"; license = lib.licenses.wtfpl; mainProgram = "sysmenu"; maintainers = with lib.maintainers; [ matteopacini ]; platforms = lib.platforms.linux; }; } </ins>
stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; <del> version = "1.7.0-unstable-2024-05-09"; </del> <ins> version = "1.9.2"; </ins> src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; <del> # FIXME: switch to a tagged release once available > 1.7.0 # Fix for https://github.com/NixOS/nixpkgs/issues/313350 rev = "3ac510f6a41feb1b695381fa30869d557c00b822"; hash = "sha256-ZmkeYPiCy7vkXnMFbtUF4761K+I+Ef7UbmSY7dJG09U="; </del> <ins> rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-1GsRBAVAfD0SAM1gk8W+bX7MtxunGKOLtXweL4rrf9Q="; </ins> }; nativeBuildInputs = [
cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; <del> hash = "sha256-RsRz/nb8L+pL1U4l6RnvqeDFddPvcBFH4wdV7G60pxA="; </del> <ins> hash = "sha256-rabiNqw4hg0Js8VadxfkhNLIsrKfMuoKa5lFIfSMNPY="; </ins> }; makeFlags = [
# FIXME: Try enabling this once the default linux kernel is at least 6.7 doCheck = false; # needs bcachefs module loaded on builder <del> patches = [ # code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal) # upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261 ./fix-encrypted-boot.patch # https://github.com/koverstreet/bcachefs-tools/pull/305 (fetchpatch { name = "use-ar-var-in-makefile.patch"; url = "https://github.com/koverstreet/bcachefs-tools/commit/91e67ab2bd48fa135a1f5109b23899a4f1019a03.patch"; sha256 = "sha256-nB4Tgcwa8eeasIDQ4rrYORie/X8LMuCSRi+WJNw+R/U="; }) ]; </del> postPatch = '' substituteInPlace Makefile  --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs"
#!/usr/bin/env nix-shell <del> #! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git </del> <ins> #! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git </ins> import click import click_log
reverse=True, ) return versions def get_git_hash(self, rev: str): return ( subprocess.check_output( [ <del> "nix-universal-prefetch", "fetchFromGitLab", "--owner", self.owner, "--repo", self.repo, "--rev", rev, </del> <ins> "nix-prefetch-url", "--unpack", f"https://gitlab.com/{self.owner}/{self.repo}/-/archive/{rev}/{self.repo}-{rev}.tar.gz", </ins> ] ) .decode("utf-8")
inherit version src; pyproject = true; <ins> patches = [ # Pull in https://github.com/mealie-recipes/mealie/pull/4002 manually until # it lands in an upstream mealie release. # See https://github.com/NixOS/nixpkgs/issues/321623. ( fetchpatch { url = "https://github.com/mealie-recipes/mealie/commit/65ece35966120479db903785b22e9f2645f72aa4.patch"; hash = "sha256-4Nc0dFJrZ7ElN9rrq+CFpayKsrRjRd24fYraUFTzcH8="; }) ]; </ins> build-system = with pythonpkgs; [ poetry-core ]; nativeBuildInputs = [ makeWrapper ];
platforms = platforms.linux; }; }; <ins> # FIXME: check if this downgrade is still required when bumping gerbolyze # https://github.com/jaseg/gerbolyze/issues/47 resvg' = resvg.overrideAttrs (old: rec { version = "0.41.0"; src = old.src.override { rev = "v${version}"; hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY="; }; cargoDeps = old.cargoDeps.overrideAttrs (lib.const { name = "${old.pname}-${version}-vendor.tar.gz"; inherit src; outputHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww="; }); }); </ins> in python3Packages.buildPythonApplication rec { inherit version src; pname = "gerbolyze";
pythonImportsCheck = [ "gerbolyze" ]; <del> nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ]; </del> <ins> nativeCheckInputs = [ python3Packages.pytestCheckHook resvg' svg-flatten ]; </ins> meta = with lib; { description = "Directly render SVG overlays into Gerber and Excellon files";
</section> <ins> <section xml:id="sec-autojump"> <title>Autojump</title> <para> autojump needs the shell integration to be useful but unlike other systems, nix doesn't have a standard share directory location. This is why a <command>autojump-share</command> script is shipped that prints the location of the shared folder. This can then be used in the .bashrc like this: <screen> source "$(autojump-share)/autojump.bash" </screen> </para> </section> </ins> </chapter>
mkdir -p "$out/etc/bash_completion.d" cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d" <del> # FIXME: What's the right place for `autojump.zsh'? # This can be used as a workaround in .zshrc: # . $HOME/.nix-profile/share/autojump/autojump.zsh </del> <ins> cat <<SCRIPT > $out/bin/autojump-share #!/bin/sh # Run this script to find the autojump shared folder where all the shell # integration scripts are living. echo $out/share/autojump SCRIPT chmod +x $out/bin/autojump-share </ins> ''; meta = {
inherit (lib) types; cfg = config.services.ollama; <del> ollamaPackage = cfg.package.override { </del> <ins> ollamaPackage = cfg.package.override (prevArgs: { </ins> inherit (cfg) acceleration; <ins> } // lib.optionalAttrs (prevArgs ? linuxPackages) { </ins> linuxPackages = config.boot.kernelPackages // { nvidia_x11 = config.hardware.nvidia.package; }; <del> }; </del> <ins> }); </ins> in { options = {
<ins> { lib, rustPlatform, fetchFromGitHub, linux-pam, testers, shpool, }: rustPlatform.buildRustPackage rec { pname = "shpool"; version = "0.6.2"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${version}"; hash = "sha256-6gfK71uM6IOP571Jzv3QPPKITaRteXyySZAstH0e+/M="; }; postPatch = '' substituteInPlace systemd/shpool.service  --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; cargoHash = "sha256-rJ+Avq/6y68xEcJ+EeFVhFaSWJyC+x0a46cclVsTE4Q="; buildInputs = [ linux-pam ]; # The majority of tests rely on impure environment # (such as systemd socket, ssh socket), and some of them # have race conditions. They don't print their full name, # tried skipping them but failed doCheck = false; postInstall = '' install -Dm444 systemd/shpool.service -t $out/lib/systemd/user install -Dm444 systemd/shpool.socket -t $out/lib/systemd/user ''; passthru.tests.version = testers.testVersion { command = "shpool version"; package = shpool; }; meta = { description = "Persistent session management like tmux, but more lightweight"; homepage = "https://github.com/shell-pool/shpool"; license = lib.licenses.asl20; mainProgram = "shpool"; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; } </ins>
(lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; <ins> postPatch = '' substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}' ''; </ins> postInstall = '' wrapProgram $out/bin/fastfetch  --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
{ lib, stdenv, fetchurl, substituteAll , pkg-config, autoreconfHook <del> , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends </del> <ins> , cups, zlib, libjpeg, libusb1, python311Packages, sane-backends </ins> , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi , bash, util-linux
# There are some binaries there, which reference gcc-unwrapped otherwise. stripDebugList = [ <del> "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" </del> <ins> "share/hplip" "lib/cups/backend" "lib/cups/filter" python311Packages.python.sitePackages "lib/sane" </ins> ]; meta = with lib; {
aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { <del> x86_64-linux = "sha256-33W7uDxzfAQ5gH10sI4IbzmHl8SxQLYj88C/BGOoRks="; aarch64-linux = "sha256-ZAr9vymCdLFAYiXEXtT+97x1tY5mrbr2N6INj4Bp4Nk="; x86_64-darwin = "sha256-dgOtufARRVmwtXl+csmr2sMBzDvq+5XRotOQrTz8jys="; aarch64-darwin = "sha256-R5TQJq+sRUFHH8EuaXgeSJUOnhepbCJLTUmO0FMOgzE="; </del> <ins> x86_64-linux = "sha256-TQZl5TEAAEeC+/dK4F7nbyPOU3YuXheLwrFY/8eGtoA="; aarch64-linux = "sha256-fnIRQsqg6WxD4ptxJT04jvaqDe7jPJ/zVnBL7k9ph38="; x86_64-darwin = "sha256-gwkCsVdSiWCCd0B3FiSvVnZiPJfWtnAgrAVPZh+nko0="; aarch64-darwin = "sha256-QXG/5AfEQNFDcQhV+oK117bKZnSZ32P4NB4p+qUKQIM="; </ins> }; in fetchurl {
, fetchFromGitHub , buildMozillaMach , nixosTests <ins> , python311 </ins> }: ((buildMozillaMach rec { pname = "floorp"; <del> packageVersion = "11.14.1"; </del> <ins> packageVersion = "11.15.0"; </ins> applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official";
repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; <del> hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; </del> <ins> hash = "sha256-LRuts3O3Rj5e6rT9gKTTwAIsY0oSziuiZ3rzE7wHa7o="; </ins> }; extraConfigureFlags = [
]; extraPostPatch = '' <del> # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin # https://github.com/NixOS/nixpkgs/issues/314115 </del> <ins> # Fix .desktop files for PWAs generated by Floorp # The executable path returned by Services.dirsvc.get() is absolute and # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each # update, rely on `floorp` being in $PATH, as before. </ins> substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs  <del> --replace-fail /usr/bin/floorp floorp </del> <ins> --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' floorp </ins> ''; updateScript = ./update.sh;
# since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro" <del> ++ lib.optional (stdenv.hostPlatform.linker == "lld") # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown' </del> <ins> ++ lib.optional (stdenv.hostPlatform.linker == "lld" && rustc ? llvmPackages.lld) # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown' </ins> "-C linker=${rustc.llvmPackages.lld}/bin/lld" ++ lib.optional (stdenv.hasCC && stdenv.hostPlatform.linker != "lld") "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
}: let <del> # Returns a true if the builder's rustc was built with support for the target. targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget (lib.splitString "," (lib.removePrefix "--target=" ( lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0) )); # If the build's rustc was built with support for the target then reuse it. (Avoids uneeded compilation for targets like `wasm32-unknown-unknown`) rustc' = if targetAlreadyIncluded then pkgsBuildBuild.rustc else rustc; cargo' = if targetAlreadyIncluded then pkgsBuildBuild.cargo else cargo; </del> # Create rustc arguments to link against the given list of dependencies # and renames. #
# https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 crateBin = lib.filter (bin: !(bin ? name && bin.name == ",")) (crate.crateBin or [ ]); hasCrateBin = crate ? crateBin; <ins> buildCrate = import ./build-crate.nix { inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; rustc = rust; }; </ins> in stdenv.mkDerivation (rec {
name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; <del> nativeBuildInputs = [ rustc' cargo' jq ] </del> <ins> nativeBuildInputs = [ rust cargo jq ] </ins> ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_;
makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; <del> buildRustCrate = callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. }); </del> <ins> buildRustCrate = let # Returns a true if the builder's rustc was built with support for the target. targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget (lib.splitString "," (lib.removePrefix "--target=" ( lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0 ))); in callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. } // lib.optionalAttrs targetAlreadyIncluded { inherit (pkgsBuildBuild) rustc cargo; } # Optimization. ); </ins> buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cargo2junit = callPackage ../development/tools/rust/cargo2junit { };
<ins> diff --git a/src/Utils/Process.cpp b/src/Utils/Process.cpp index 5688fb1..6cea8d8 100644 --- a/src/Utils/Process.cpp +++ b/src/Utils/Process.cpp @@ -392,7 +392,7 @@ namespace gamescope::Process pid_t SpawnProcessInWatchdog( char **argv, bool bRespawn, std::function<void()> fnPreambleInChild ) { std::vector<char *> args; -        args.push_back( (char *)"gamescopereaper" ); +        args.push_back( (char *)"@gamescopereaper@" ); if ( bRespawn ) args.push_back( (char *)"--respawn" ); args.push_back( (char *)"--" ); </ins>
in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; <del> version = "3.14.23"; </del> <ins> version = "3.14.24"; </ins> src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; <del> hash = "sha256-qXwCzNGlkGmO3BkQ74tJxufmjh4dUWzIgjHzDCEShU8="; </del> <ins> hash = "sha256-+8uojnfx8V8BiYAeUsOaXTXrlcST83z6Eld7qv1oboE="; </ins> }; patches = [ # Make it look for shaders in the right place ./shaders-path.patch <ins> # patch relative gamescopereaper path with absolute ./gamescopereaper.patch </ins> ]; # We can't substitute the patch itself because substituteAll is itself a derivation,
substituteInPlace src/reshade_effect_manager.cpp --replace "@out@" "$out" # Patching shebangs in the main `libdisplay-info` build patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py <ins> # Replace gamescopereeaper with absolute path substituteInPlace src/Utils/Process.cpp --subst-var-by "gamescopereaper" "$out/bin/gamescopereaper" </ins> ''; mesonFlags = [