Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72cf5a111916
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9cbb69b11a21
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 28, 2017

  1. xonotic: fix audio 

    This fixes #26117.

Also allow easy switching to debug/profiling builds.
    @lheckemann
    lheckemann committed May 28, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cf456b9 View commit details

Commits on May 30, 2017

  1. Merge pull request #26182 from lheckemann/xonotic-audio 

    xonotic: fix audio
    @FRidh
    FRidh authored May 30, 2017
    Copy the full SHA
    9cbb69b View commit details
Showing with 18 additions and 5 deletions.
  1. +18 −5 pkgs/games/xonotic/default.nix
23 changes: 18 additions & 5 deletions pkgs/games/xonotic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,11 +27,16 @@ stdenv.mkDerivation rec {

sourceRoot = "Xonotic/source/darkplaces";

# "debug", "release", "profile"
target = "release";

dontStrip = target != "release";

buildPhase = ''
DP_FS_BASEDIR="$out/share/xonotic"
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
make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-${target}
make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-${target}
make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-${target}
'';
enableParallelBuilding = true;

@@ -52,8 +57,16 @@ stdenv.mkDerivation rec {
dontPatchELF = true;
postFixup = ''
patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-dedicated
patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-sdl
patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-glx
patchelf \
--add-needed ${curl.out}/lib/libcurl.so \
--add-needed ${libvorbis}/lib/libvorbisfile.so \
--add-needed ${libvorbis}/lib/libvorbis.so \
$out/bin/xonotic-glx
patchelf \
--add-needed ${curl.out}/lib/libcurl.so \
--add-needed ${libvorbis}/lib/libvorbisfile.so \
--add-needed ${libvorbis}/lib/libvorbis.so \
$out/bin/xonotic-sdl
'';

meta = {