diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-01-05 09:44:18 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-01-05 11:54:46 +0100 |
commit | e753f795e2049d38e0f64b9507a6285eca1ff28b (patch) | |
tree | 49608392e7ef7f0faa2e8b9dd0142f084fe04455 /pkgs/os-specific/linux/guvcview/default.nix | |
parent | 550fe7f233b7ccd4b3eec8f16a7b3c07b2845549 (diff) | |
download | nixpkgs-e753f795e2049d38e0f64b9507a6285eca1ff28b.tar nixpkgs-e753f795e2049d38e0f64b9507a6285eca1ff28b.tar.gz nixpkgs-e753f795e2049d38e0f64b9507a6285eca1ff28b.tar.bz2 nixpkgs-e753f795e2049d38e0f64b9507a6285eca1ff28b.tar.lz nixpkgs-e753f795e2049d38e0f64b9507a6285eca1ff28b.tar.xz nixpkgs-e753f795e2049d38e0f64b9507a6285eca1ff28b.tar.zst nixpkgs-e753f795e2049d38e0f64b9507a6285eca1ff28b.zip |
guvcview: 1.7.2 -> 2.0.2
* Download tarball instead of git repo, drop autoreconfHook. * The application now needs SDL2 instead of SDL. * The build failed without 'gsl', so add that. (I think ./configure can be told to build without it, but it's only 5.7 MiB.)
Diffstat (limited to 'pkgs/os-specific/linux/guvcview/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/guvcview/default.nix | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 6e4a2caba18..940a627e5c2 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchgit, intltool, autoreconfHook, gettext, pkgconfig -, gtk3, portaudio, libpng, SDL, ffmpeg, udev, libusb1, libv4l, alsaLib }: +{ stdenv, fetchurl, intltool, gettext, pkgconfig +, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl }: stdenv.mkDerivation rec { - version = "1.7.2"; - rev = "ab84b0b1ed358f0504e1218a0ef792a02b307af8"; - name = "guvcview-${version}_${rev}"; + version = "2.0.2"; + name = "guvcview-${version}"; - src = fetchgit { - inherit rev; - url = "git://git.code.sf.net/p/guvcview/git-master"; - sha256 = "08cpbxq3dh2mlsgzk5dj3vfrgap4q281n9h6xzpbsvyifcj1a9n1"; + src = fetchurl { + url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz"; + sha256 = "1hnx6h2d3acwpw93ahj54nhizd6qrmylylq6qbjxvilbfprg6y34"; }; buildInputs = - [ SDL + [ SDL2 alsaLib - autoreconfHook ffmpeg gtk3 intltool @@ -24,12 +21,9 @@ stdenv.mkDerivation rec { pkgconfig portaudio udev + gsl ]; - preConfigure = '' - ./bootstrap.sh - ''; - meta = { description = "A simple interface for devices supported by the linux UVC driver"; homepage = http://guvcview.sourceforge.net; |