raspberrypi-tools: remove in favor of libraspberrypi
These packages were duplicated, and often weren't being updated in sync. The only difference between them was the lack of pkg-config in libraspberrypi, which is easily fixable.
This commit is contained in:
parent
924d461587
commit
979a1e109f
3 changed files with 1 additions and 39 deletions
|
@ -1,37 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "raspberrypi-tools";
|
||||
version = "2020-05-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "userland";
|
||||
rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74";
|
||||
sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/raspberrypi/userland/pull/670
|
||||
url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
|
||||
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
|
||||
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
|
||||
cmakeFlagsArray+=("-DARM64=1")
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Userland tools for the Raspberry Pi board";
|
||||
homepage = "https://github.com/raspberrypi/userland";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ dezgeg tavyc ];
|
||||
};
|
||||
}
|
|
@ -500,6 +500,7 @@ mapAliases ({
|
|||
qtcurve = libsForQt5.qtcurve; # added 2020-11-07
|
||||
qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26
|
||||
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
|
||||
raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24
|
||||
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
|
||||
rdiff_backup = rdiff-backup; # added 2014-11-23
|
||||
rdmd = dtools; # added 2017-08-19
|
||||
|
|
|
@ -19164,8 +19164,6 @@ in
|
|||
|
||||
raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {};
|
||||
|
||||
raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {};
|
||||
|
||||
regionset = callPackage ../os-specific/linux/regionset { };
|
||||
|
||||
rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
|
||||
|
|
Loading…
Reference in a new issue