public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uhd: 3.11.0.0 -> 3.12.0.0

Browse Source 
* fixes build on Darwin.
* fetch images from GH releases page (uniform versioning scheme)
This commit is contained in:
Luke Adams 2018-06-26 16:47:22 -05:00
parent c5cb7e550e
commit 2166d37c0f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/misc/uhd/default.nix
View File

@ -9,17 +9,15 @@
let let
uhdVer = "v" + version; uhdVer = "v" + version;
ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz";
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing # and xxx.yyy.zzz. Hrmpf... style keeps changing
version = "3.11.0.0"; version = "3.12.0.0";
# Firmware images are downloaded (pre-built) from: # Firmware images are downloaded (pre-built) from the respective release on Github
# http://files.ettus.com/binaries/images/
uhdImagesSrc = fetchurl { uhdImagesSrc = fetchurl {
url = "http://files.ettus.com/binaries/images/${ImgVer}"; url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z"; sha256 = "1glf2qay4asajbl92fy432idqk0sj5h603najr8sgkbdyyyr933p";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -29,7 +27,7 @@ in stdenv.mkDerivation {
owner = "EttusResearch"; owner = "EttusResearch";
repo = "uhd"; repo = "uhd";
rev = "${uhdVer}"; rev = "${uhdVer}";
sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q"; sha256 = "0m7vw7dmvn7d01kkzphayzi0bk50m5v9a17rpnxhn0bqhw282ksv";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -49,8 +47,10 @@ in stdenv.mkDerivation {
postPhases = [ "installFirmware" ]; postPhases = [ "installFirmware" ];
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
installFirmware = '' installFirmware = ''
tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out" mkdir -p "$out/share/uhd/images"
tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {