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: 513c659d566b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 80389f0046a5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 5, 2018

  1. openarena: fix loading libGL.so with libglvnd

    @avnik
    avnik committed Nov 5, 2018
    Copy the full SHA
    b0d4700 View commit details

Commits on Nov 14, 2018

  1. Merge pull request #49794 from avnik/fix/openarena 

    openarena: fix loading libGL.so with libglvnd
    @Mic92
    Mic92 authored Nov 14, 2018
    Copy the full SHA
    80389f0 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/games/openarena/default.nix
4 changes: 2 additions & 2 deletions pkgs/games/openarena/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis, curl }:
{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl }:

stdenv.mkDerivation rec {
name = "openarena-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = let
gameDir = "$out/openarena-$version";
interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis curl ];
libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl ];
in ''
mkdir -pv $out/bin
cd $out