Unverified Commit 2e804dfd authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

darkplaces: unstable-2022-05-10 -> 20140513-unstable-2026-01-22; nexuiz: use... 

darkplaces: unstable-2022-05-10 -> 20140513-unstable-2026-01-22; nexuiz: use darkplaces from nixpkgs (#506587)
parents 1c4114e8 a55d7554

pkgs/by-name/da/darkplaces/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
}:

stdenv.mkDerivation {

  pname = "darkplaces";

  version = "unstable-2022-05-10";

  version = "20140513-unstable-2026-01-22";



  src = fetchFromGitHub {

    owner = "DarkPlacesEngine";

    repo = "darkplaces";

    rev = "f16954a9d40168253ac5d9890dabcf7dbd266cd9";

    hash = "sha256-5KsUcgHbuzFUE6LcclqI8VPSFbXZzBnxzOBB9Kf8krI=";

    rev = "d93f9c4292039354a2b8d40d11bc386891e55fe5";

    hash = "sha256-/xbQhQZveRCSnotZz3Wbw+9VwNC+kqoEJ7GuNZTpkLA=";

  };



  buildInputs = [

pkgs/by-name/ne/nexuiz/package.nix

+10 −59
Original line number Diff line number Diff line
@@ -2,28 +2,9 @@ 
  lib,

  stdenv,

  fetchurl,

  # required for both

  unzip,

  zlib,

  curl,

  libjpeg,

  libpng,

  libvorbis,

  libtheora,

  libogg,

  libmodplug,

  # glx

  libx11,

  libGLU,

  libGL,

  libxpm,

  libxext,

  libxxf86vm,

  libxxf86dga,

  alsa-lib,

  # sdl

  SDL,

  # icon

  makeBinaryWrapper,

  darkplaces,

  copyDesktopItems,

  makeDesktopItem,

}:
@@ -45,19 +26,7 @@ stdenv.mkDerivation { 
  nativeBuildInputs = [

    unzip

    copyDesktopItems

  ];

  buildInputs = [

    # glx

    libx11

    libGLU

    libGL

    libxpm

    libxext

    libxxf86vm

    libxxf86dga

    alsa-lib

    # sdl

    SDL

    makeBinaryWrapper

  ];



  postUnpack = ''
@@ -66,42 +35,24 @@ stdenv.mkDerivation { 
    cd ../../

  '';



  env.NIX_LDFLAGS = toString [

    "-rpath ${zlib.out}/lib"

    "-rpath ${curl.out}/lib"

    "-rpath ${libjpeg.out}/lib"

    "-rpath ${libpng.out}/lib"

    "-rpath ${libvorbis.out}/lib"

    "-rpath ${libtheora.out}/lib"

    "-rpath ${libogg.out}/lib"

    "-rpath ${libmodplug.out}/lib"

  ];



  buildPhase = ''

    cd sources/darkplaces/

    DP_FS_BASEDIR="$out/share/nexuiz"

    make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release

    make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release

    make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release

    cd ../../

  '';

  dontBuild = true;



  installPhase = ''

    runHook preInstall

    mkdir -pv "$out/bin/"

    cp -v sources/darkplaces/darkplaces-glx "$out/bin/nexuiz-glx"

    cp -v sources/darkplaces/darkplaces-sdl "$out/bin/nexuiz-sdl"

    cp -v sources/darkplaces/darkplaces-dedicated "$out/bin/nexuiz-dedicated"

    makeWrapper ${lib.getBin darkplaces}/bin/darkplaces $out/bin/nexuiz \

      --inherit-argv0 \

      --add-flags "-basedir $out/share/nexuiz"

    makeWrapper ${lib.getBin darkplaces}/bin/darkplaces-dedicated $out/bin/nexuiz-dedicated \

      --inherit-argv0 \

      --add-flags "-basedir $out/share/nexuiz"

    mkdir -pv "$out/share/nexuiz/"

    cp -rv data/ "$out/share/nexuiz/"

    ln -s "$out/bin/nexuiz-sdl" "$out/bin/nexuiz"

    mkdir -pv $out/share/icon/

    cp sources/darkplaces/nexuiz.ico $out/share/icon/nexuiz.ico

    runHook postInstall

  '';



  dontPatchELF = true;



  desktopItems = [

    (makeDesktopItem {

      name = "Nexuiz";