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

Commits on May 29, 2017

  1. irrlicht: link to X11 libs explicitly 

    This allows applications that require irrlicht to depend on the X
libraries implicitly rather than explicitly.
    @lheckemann
    lheckemann committed May 29, 2017
    Copy the full SHA
    c14bf4f View commit details

Commits on May 31, 2017

  1. Merge pull request #26265 from lheckemann/irrlicht-libs 

    irrlicht: link to X11 libs explicitly
    @Fuuzetsu
    Fuuzetsu authored May 31, 2017
    Copy the full SHA
    427f5bc View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/libraries/irrlicht/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/irrlicht/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';

buildPhase = ''
make sharedlib NDEBUG=1
make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm"
'';

preInstall = ''