dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #131335 from siraben/remarkable-toolchain-update

Browse Source 
Remarkable toolchain update
This commit is contained in:
Sandro 2021-07-24 22:46:46 +00:00 committed by GitHub
commit f80af7c602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
View File

@ -1,18 +1,18 @@
{ lib, stdenv, fetchurl, libarchive, python, file, which }: { lib, stdenv, fetchurl, libarchive, python3, file, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "remarkable-toolchain"; pname = "remarkable-toolchain";
version = "1.8-23.9.2019"; version = "3.1.2";
src = fetchurl { src = fetchurl {
url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh"; url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa9hf-neon-rm10x-toolchain-${version}.sh";
sha256 = "1rk1r80m5d18sw6hrybj6f78s8pna0wrsa40ax6j8jzfwahgzmfb"; sha256 = "sha256-ocODUUx2pgmqxMk8J+D+OvqlSHBSay6YzcqnxC9n59w=";
executable = true; executable = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
libarchive libarchive
python python3
file file
which which
]; ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A toolchain for cross-compiling to reMarkable tablets"; description = "A toolchain for cross-compiling to reMarkable tablets";
homepage = "https://remarkable.engineering/"; homepage = "https://remarkable.engineering/";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ nickhu siraben ]; maintainers = with maintainers; [ nickhu siraben ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };

24
pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
View File

@ -1,32 +1,28 @@
{ lib, stdenv, fetchurl, libarchive, python3, file }: { lib, stdenv, fetchurl, libarchive, python3, file, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "remarkable2-toolchain"; pname = "remarkable2-toolchain";
version = "2.5.2"; version = "3.1.2";
src = fetchurl { src = fetchurl {
url = "https://storage.googleapis.com/codex-public-bucket/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh";
sha256 = "1v410q1jn8flisdpkrymxd4pa1ylawd0rh3rljjpkqw1bp8a5vw1"; sha256 = "sha256-JKMDRbkvoxwHiTm/o4JdLn3Mm2Ld1LyxTnCCwvnxk4c=";
executable = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
libarchive libarchive
python3 python3
file file
which
]; ];
unpackCmd = '' dontUnpack = true;
mkdir src
install $curSrc src/install-toolchain.sh
'';
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''
patchShebangs install-toolchain.sh mkdir -p $out
sed -i -e '3,9d' install-toolchain.sh # breaks PATH ENVCLEANED=1 $src -y -d $out
sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh
./install-toolchain.sh -D -y -d $out
''; '';
meta = with lib; { meta = with lib; {
@ -34,6 +30,6 @@ stdenv.mkDerivation rec {
homepage = "https://remarkable.engineering/"; homepage = "https://remarkable.engineering/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ tadfisher ]; maintainers = with maintainers; [ tadfisher ];
platforms = platforms.x86_64; platforms = [ "x86_64-linux" ];
}; };
} }