From 2ec495e943bc72a1d6dc3747872245079609d460 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 16 Jun 2018 11:15:16 -0400 Subject: [PATCH] glava: init at v1.4.5 --- maintainers/maintainer-list.nix | 7 +- pkgs/applications/misc/glava/default.nix | 105 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/glava/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0aa91a31313..69026779c32 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -571,7 +571,7 @@ email = "brandon.barker@gmail.com"; github = "bbarker"; name = "Brandon Elam Barker"; - }; + }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; @@ -1162,6 +1162,11 @@ github = "e-user"; name = "Alexander Kahl"; }; + eadwu = { + email = "edmund.wu@protonmail.com"; + github = "eadwu"; + name = "Edmund Wu"; + }; earldouglas = { email = "james@earldouglas.com"; github = "earldouglas"; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix new file mode 100644 index 00000000000..d115d1ae1d2 --- /dev/null +++ b/pkgs/applications/misc/glava/default.nix @@ -0,0 +1,105 @@ +{ stdenv, fetchurl, writeScript, fetchFromGitHub +, libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite +, enableGlfw ? false, glfw }: + +let + inherit (stdenv.lib) optional makeLibraryPath; + + version = "1.4.5"; + gladVersion = "0.1.24"; + # glad + # https://github.com/wacossusca34/glava/issues/46#issuecomment-397816520 + glad = fetchFromGitHub { + owner = "Dav1dde"; + repo = "glad"; + rev = "v${gladVersion}"; + sha256 = "0s2c9w064kqa5i07w8zmvgpg1pa3wj86l1nhgw7w56cjhq7cf8h8"; + }; + # gl.xml + gl = fetchurl { + url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/a24f3f7a4c924fdbc666024f99c70e5b8e34c819/xml/gl.xml; + sha256 = "1mskxjmhb35m8qv255pibf633d8sn1w9rdsf0lj75bhlgy0zi5c7"; + }; + # 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 + --copy-config) + # The binary would symlink it, which won't work in Nix because the + # garbage collector will eventually remove the original files after + # updates + echo "Nix wrapper: Copying glava config to ~/.config/glava" + cp -r --no-preserve=all @out@/etc/xdg/glava ~/.config/glava + ;; + *) + exec @out@/bin/.glava-unwrapped "$@" + esac + ''; +in + stdenv.mkDerivation rec { + name = "glava-${version}"; + + src = fetchFromGitHub { + owner = "wacossusca34"; + repo = "glava"; + rev = "v${version}"; + sha256 = "1zfw8samrzxxbny709rcdz1z77cw1cd46wlfnf7my02kipmqn0nr"; + }; + + buildInputs = [ + libX11 + libXext + libXrandr + libXrender + libpulseaudio + libXcomposite + ] ++ optional enableGlfw glfw; + + nativeBuildInputs = [ + python3 + ]; + + patchPhase = '' + cp -r --no-preserve=all ${glad}/* glad + mkdir -p glad/include/KHR + + cp ${gl} glad/gl.xml + cp ${egl} glad/include/KHR/khrplatform.h + patchShebangs . + ''; + + makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1"; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + fixupPhase = '' + mkdir -p $out/bin + mv $out/usr/bin/glava $out/bin/.glava-unwrapped + rm -rf $out/usr + + patchelf $out/bin/.glava-unwrapped \ + --set-rpath "$(patchelf --print-rpath $out/bin/.glava-unwrapped):${makeLibraryPath [ libGL ]}" \ + + substitute ${wrapperScript} $out/bin/glava --subst-var out + chmod +x $out/bin/glava + ''; + + meta = with stdenv.lib; { + description = '' + OpenGL audio spectrum visualizer + ''; + homepage = https://github.com/wacossusca34/glava; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 718041ee753..555f41e8a7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20874,6 +20874,8 @@ with pkgs; x11Support = true; }); + glava = callPackage ../applications/misc/glava {}; + gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; gnuk = callPackage ../misc/gnuk {