diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-02-24 19:19:21 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-02-24 19:19:21 +0000 |
commit | 06afa6115de0108860cd5196fbfa1c3809416948 (patch) | |
tree | 95f3250a2cd27f2e217f27152f2eba0cdaa028b8 | |
parent | ee3e8092a6ce4f0456549db1ca041e69e701ed8f (diff) | |
download | nixpkgs-06afa6115de0108860cd5196fbfa1c3809416948.tar nixpkgs-06afa6115de0108860cd5196fbfa1c3809416948.tar.gz nixpkgs-06afa6115de0108860cd5196fbfa1c3809416948.tar.bz2 nixpkgs-06afa6115de0108860cd5196fbfa1c3809416948.tar.lz nixpkgs-06afa6115de0108860cd5196fbfa1c3809416948.tar.xz nixpkgs-06afa6115de0108860cd5196fbfa1c3809416948.tar.zst nixpkgs-06afa6115de0108860cd5196fbfa1c3809416948.zip |
quake3demo: fix binary paths in the wrapper
https://github.com/NixOS/nixpkgs/pull/209008 moved quake3 binaries to $out/bin. This broke wrappers as: $ NIXPKGS_ALLOW_UNFREE=1 nix build -f. quake3demo -L ... quake3-demo> Builder called die: Cannot wrap '/nix/store/khlq2wa0i7rab4vkzvk4pl54lyi6c36d-quake3-demo-1.11-6-ioquake3-unstable-2022-11-24/bin/quake3' because it is not an executable file The change fixes wrapper to point to new locations.
-rw-r--r-- | pkgs/games/quake3/wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 3cb64641153..3c777c5b27f 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback # software rendering. GCC is needed so that libgcc_s.so can be found # when Mesa is used. - makeWrapper ${env}/ioquake3.* $out/bin/quake3 \ + makeWrapper ${env}/bin/ioquake3.* $out/bin/quake3 \ --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" - makeWrapper ${env}/ioq3ded.* $out/bin/quake3-server \ + makeWrapper ${env}/bin/ioq3ded.* $out/bin/quake3-server \ --add-flags "+set fs_basepath ${env}" ''; |