diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-06-15 11:02:19 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2020-06-15 11:02:19 +0800 |
| commit | 78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5 (patch) | |
| tree | 692057079a4456907a142213fe776d24c355ebda | |
| parent | a84278aee5fa0cfb0da6707628539f9b1256f6c3 (diff) | |
| download | nixpkgs-78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5.tar nixpkgs-78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5.tar.gz nixpkgs-78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5.tar.bz2 nixpkgs-78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5.tar.lz nixpkgs-78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5.tar.xz nixpkgs-78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5.tar.zst nixpkgs-78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5.zip | |
spek: 0.8.3 -> unstable-2018-12-29
Build using the newly introduced wxGTK30-gtk3 in order to drop old gtk2 and ffmpeg dependencies.
| -rw-r--r-- | pkgs/applications/audio/spek/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 88b22c59ae5..d6918b19231 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }: +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; - version = "0.8.3"; + version = "unstable-2018-12-29"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz"; - sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; + src = fetchFromGitHub { + owner = "alexkay"; + repo = "spek"; + rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; + sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake intltool ffmpeg wxGTK ]; + # needed for autoreconfHook + AUTOPOINT="intltoolize --automake --copy"; - preConfigure = '' - ./autogen.sh - ''; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + + buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; meta = with stdenv.lib; { description = "Analyse your audio files by showing their spectrogram"; homepage = "http://spek.cc/"; license = licenses.gpl3; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e98b1f9c18..96e38d5280b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22194,9 +22194,7 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { - ffmpeg = ffmpeg_2; - }; + spek = callPackage ../applications/audio/spek { }; spotify = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; |