diff options
| author | Edmund Wu <22758444+eadwu@users.noreply.github.com> | 2018-10-11 05:53:41 -0400 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-11 11:53:41 +0200 |
| commit | 1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19 (patch) | |
| tree | bff05b51a67340ffc15d529f09dc031aefb38341 | |
| parent | 4f3c13b84f1b762b27785b9dc68b4382eabc1c73 (diff) | |
| download | nixlib-1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19.tar nixlib-1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19.tar.gz nixlib-1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19.tar.bz2 nixlib-1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19.tar.lz nixlib-1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19.tar.xz nixlib-1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19.tar.zst nixlib-1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19.zip | |
glava: 1.5.1 -> 1.5.5 (#48086)
| -rw-r--r-- | pkgs/applications/misc/glava/default.nix | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 1eb0d0048f64..7e32e566234e 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -5,17 +5,6 @@ let inherit (stdenv.lib) optional makeLibraryPath; - # gl.xml - gl = fetchurl { - url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/56312cfe680e4be5ae61bbf1c628e420f8731718/xml/gl.xml; - sha256 = "1c45bcgaxiic5gmb3gkrd9qcvascvij97vz5y6fc3a2y7x3gjc5l"; - }; - # EGL 1.5 - egl = fetchurl { - url = https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h; - sha256 = "0p0vs4siiya05cvbqq7cw3ci2zvvlfh8kycgm9k9cwvmrkj08349"; - }; - wrapperScript = writeScript "glava" '' #!${stdenv.shell} case "$1" in @@ -33,12 +22,12 @@ let in stdenv.mkDerivation rec { name = "glava-${version}"; - version = "1.5.1"; + version = "1.5.5"; src = fetchgit { url = "https://github.com/wacossusca34/glava.git"; rev = "v${version}"; - sha256 = "1k8x0a0g2pm7ficsk4az9s7mjbm85a987apjg5c4y6iyldxgd6sb"; + sha256 = "0mpbgllwz45wkax6pgvnh1pz2q4yvbzq2l8z8kff13wrsdvl8lh0"; }; buildInputs = [ @@ -54,12 +43,8 @@ in python3 ]; - patchPhase = '' - mkdir -p glad/include/KHR - - cp ${gl} glad/gl.xml - cp ${egl} glad/include/KHR/khrplatform.h - patchShebangs . + preConfigure = '' + export CFLAGS="-march=native" ''; makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1"; |