Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to SDK 6.3 and NixOS 23.05 #1

Draft
wants to merge 1 commit into
base: wip
Choose a base branch
from
Draft

Update to SDK 6.3 and NixOS 23.05 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions overlay/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ self: super:
sdk = self.callPackage ./sdk {
libpng = super.libpng12;
libjpeg = self.libjpeg8;
sdkver = "3.0.12";
revision = "2019-06-12-77ed6f47e";
sha256 = "0pc1vgfm3gdw0bc06602k78q658r4x9144nvaidqnagn7iaq9b86";
sdkver = "6.3.0";
revision = "2023-08-29-fc81ed416";
sha256 = "sha256-A4rU0B9MYz5XxRLWEhqjQPyngFgH1z81O1FlLXppkkk=";
};

beta_sdk = self.callPackage ./sdk {
Expand Down
27 changes: 14 additions & 13 deletions overlay/libjpeg/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{ stdenv, fetchurl, static ? false }:
{ stdenv, fetchurl, lib, static ? false }:

with stdenv.lib;

stdenv.mkDerivation {
name = "libjpeg-8d";
let
version = "8d";
in stdenv.mkDerivation {
pname = "libjpeg";
version = version;

src = fetchurl {
url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz";
sha256 = "sha256-/cTUwRM4rQKKfSP7U/W7k1RnE5Kmf7G1LgwypxIYkfg=";
};

configureFlags = optional static "--enable-static --disable-shared";
configureFlags = lib.optional static "--enable-static --disable-shared";

outputs = [ "bin" "dev" "out" "man" ];
outputs = [ "out" "dev" "bin" "man" ];

meta = {
homepage = http://www.ijg.org/;
meta = with lib; {
homepage = "http://www.ijg.org/";
description = "A library that implements the JPEG image file format";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
license = licenses.free;
platforms = platforms.unix;
};
}
21 changes: 12 additions & 9 deletions overlay/sdk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{ stdenv
, lib
, fetchurl
, jdk8
, openjdk
, unzip
, runtimeShell
, autoPatchelfHook

# autoPatchelfHook libraries
, libusb1
, zlib
, webkitgtk24x-gtk2
, xlibs
, webkitgtk
, xorg
, libjpeg
, libpng

Expand All @@ -21,9 +22,8 @@
}:

let
inherit (stdenv.lib) makeBinPath;
binPath = makeBinPath [
jdk8
binPath = lib.makeBinPath [
openjdk
];
in
stdenv.mkDerivation rec {
Expand Down Expand Up @@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
buildInputs = [
libusb1
zlib
webkitgtk24x-gtk2
xlibs.libXxf86vm
webkitgtk
xorg.libXxf86vm
libjpeg
libpng
];
Expand All @@ -78,11 +78,14 @@ stdenv.mkDerivation rec {
done
'';

meta = {
meta = with lib; {
description = "Connect IQ SDK";
homepage = "https://developer.garmin.com/connect-iq-sdk/";
license = {
fullName = "Connect IQ License Agreement";
url = "https://developer.garmin.com/connect-iq/license-agreement/";
free = false;
};
platforms = platforms.linux;
};
}