diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:22:28 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:22:28 -0700 |
| commit | 8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36 (patch) | |
| tree | 90013bf1e284372e7de0ad6b3715dc5a0ea926d1 /pkgs/development/libraries/glfw/3.x.nix | |
| parent | 1283e3da5d0bc4657677d40fa3cb117b66489ee5 (diff) | |
| parent | 62e676b9598d2638e846761160082f6fec392ffe (diff) | |
| download | nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.gz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.bz2 nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.lz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.xz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.zst nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/libraries/glfw/3.x.nix')
| -rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 02d26759834..681137cd590 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper +{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: stdenv.mkDerivation rec { - name = "glfw-3.1.1"; + version = "3.1.2"; + name = "glfw-${version}"; - src = fetchurl { - url = "mirror://sourceforge/glfw/${name}.tar.bz2"; - sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa"; + src = fetchFromGitHub { + owner = "glfw"; + repo = "GLFW"; + rev = "${version}"; + sha256 = "1aj1dfyyd0170gpz32j2xlqbvbsxwbg028xiqai3mqc44xfp10kw"; }; enableParallelBuilding = true; @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "http://glfw.sourceforge.net/"; + homepage = "http://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux; |