summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnna Lee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>2023-11-15 11:46:03 +0000
committerannalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>2023-11-17 01:55:22 +0000
commit195bf2cb4d9d17d3f621936279faeefa462f0083 (patch)
tree85b0c0553ceb3ced80a4228e766ea5782da384fd
parent911ad1e67f458b6bcf0278fa85e33bb9924fed7e (diff)
downloadnixpkgs-195bf2cb4d9d17d3f621936279faeefa462f0083.tar
nixpkgs-195bf2cb4d9d17d3f621936279faeefa462f0083.tar.gz
nixpkgs-195bf2cb4d9d17d3f621936279faeefa462f0083.tar.bz2
nixpkgs-195bf2cb4d9d17d3f621936279faeefa462f0083.tar.lz
nixpkgs-195bf2cb4d9d17d3f621936279faeefa462f0083.tar.xz
nixpkgs-195bf2cb4d9d17d3f621936279faeefa462f0083.tar.zst
nixpkgs-195bf2cb4d9d17d3f621936279faeefa462f0083.zip
deliantra-server: use perl536; fix build
perl538 adds 'struct object' in a header causing conflicts so pin to
perl536.
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42fba003f9e..1ed14083333 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37638,6 +37638,9 @@ with pkgs;
 
   deliantra-server = callPackage ../games/deliantra/server.nix {
     stdenv = gcc10StdenvCompat;
+    # perl538 defines 'struct object' in sv.h. many conflicts result
+    perl = perl536;
+    perlPackages = perl536Packages;
   };
   deliantra-arch = callPackage ../games/deliantra/arch.nix {
     stdenv = gcc10StdenvCompat;