diff options
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/dxvk/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/misc/dxvk/dxvk.nix | 15 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/alock/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/tmux-plugins/default.nix | 2 |
4 files changed, 25 insertions, 6 deletions
diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 6664db0e9ec94..7d5af28d81072 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -22,12 +22,16 @@ stdenvNoCC.mkDerivation (finalAttrs: # platforms diverge (due to the need for Darwin-specific patches that would fail to apply). # Should that happen, set `darwin` to the last working `rev` and `hash`. srcs = rec { - darwin = { inherit (default) rev hash version; }; - default = { + darwin = { rev = "v${finalAttrs.version}"; hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; version = "1.10.3"; }; + default = { + rev = "v${finalAttrs.version}"; + hash = "sha256-mboVLdPgZMzmqyeF0jAloEz6xqfIDiY/X98e7l2KZnw="; + version = "2.0"; + }; }; in { @@ -60,10 +64,12 @@ stdenvNoCC.mkDerivation (finalAttrs: installPhase = '' mkdir -p $out/bin $bin $lib + # Replace both basedir forms to support both DXVK 2.0 and older versions. substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ - --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" + --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" \ + --replace 'basedir="$(dirname "$(readlink -f "$0")")"' "basedir=$bin" chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix index 2eb4f30df2bc3..7607c9ee44128 100644 --- a/pkgs/misc/dxvk/dxvk.nix +++ b/pkgs/misc/dxvk/dxvk.nix @@ -7,18 +7,31 @@ , windows , src , version +, spirv-headers +, vulkan-headers , dxvkPatches }: +let + # DXVK 2.0+ no longer vendors certain dependencies. This derivation also needs to build on Darwin, + # which does not currently support DXVK 2.0, so adapt conditionally for this situation. + isDxvk2 = lib.versionAtLeast version "2.0"; +in stdenv.mkDerivation { pname = "dxvk"; inherit src version; nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = [ windows.pthreads ]; + buildInputs = [ windows.pthreads ] + ++ lib.optionals isDxvk2 [ spirv-headers vulkan-headers ]; patches = dxvkPatches; + preConfigure = lib.optionalString isDxvk2 '' + ln -s ${lib.getDev spirv-headers}/include include/spirv/include + ln -s ${lib.getDev vulkan-headers}/include include/vulkan/include + ''; + mesonFlags = let arch = if stdenv.is32bit then "32" else "64"; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 74155f43c2b88..46af4b303dd6d 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Simple screen lock application for X server"; longDescription = '' alock locks the X server until the user enters a password - via the keyboard. If the authentification was successful + via the keyboard. If the authentication was successful the X server is unlocked and the user can continue to work. alock does not provide any fancy animations like xlock or diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 25a84e4b30f9f..2d209ce6a18b1 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -101,7 +101,7 @@ in rec { }; meta = { homepage = "https://github.com/tmux-plugins/tmux-continuum"; - description = "continous saving of tmux environment"; + description = "continuous saving of tmux environment"; longDescription = '' Features: |