From 6ca17de82d62bc282393cd2609e0c2e8125b4c2d Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 4 Nov 2022 21:06:05 +0100 Subject: [PATCH] vgmstream: drop It now is part of nixpkgs upstream. --- default.nix | 2 -- flake.nix | 3 +-- vgmstream/default.nix | 29 ----------------------------- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 vgmstream/default.nix diff --git a/default.nix b/default.nix index 4d761b5..2c370b4 100644 --- a/default.nix +++ b/default.nix @@ -42,7 +42,5 @@ in unxwb = callPackage ./unxwb { }; - vgmstream = callPackage ./vgmstream { }; - VisiCut = callPackage ./VisiCut { }; } diff --git a/flake.nix b/flake.nix index df24737..852bfc9 100644 --- a/flake.nix +++ b/flake.nix @@ -57,8 +57,7 @@ nsz playgsf textidote - unxwb - vgmstream; + unxwb; mpvScripts = lib.recurseIntoAttrs { inherit (pkgs.mpvScripts) diff --git a/vgmstream/default.nix b/vgmstream/default.nix deleted file mode 100644 index 8f467b5..0000000 --- a/vgmstream/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fdk_aac, ffmpeg, jansson, libao, libvorbis, mpg123 }: - -stdenv.mkDerivation rec { - pname = "vgmstream"; - version = "r1626"; - - src = fetchFromGitHub { - owner = "vgmstream"; - repo = "vgmstream"; - rev = version; - sha256 = "sha256-PdG+nkr8f/kVJpJGDvfMv7cEnYFw0dikzIMEGvm/dGQ="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ fdk_aac ffmpeg jansson libao libvorbis mpg123 ]; - - cmakeFlags = [ - "-DBUILD_AUDACIOUS=OFF" - "-DVGMSTREAM_VERSION=${version}" - ]; - - meta = with lib; { - description = "A library for playback of various streamed audio formats used in video games"; - homepage = "https://vgmstream.org/"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ sbruder ]; - platforms = platforms.all; - }; -}