nur-packages

commit 953617ec5668c4bc2c341ad7496db9ff2cb1b2d1
parent 096f95ff742face06256a29826aaff5e52d050ff
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun, 29 Oct 2023 15:04:08 +0400

Up

Diffstat:
M
pkgs/embedded/embox/default.nix
 | 
2
+-
M
pkgs/embedded/embox/third-party.json
 | 
4
++--
M
pkgs/misc/cadzinho/default.nix
 | 
17
++++++++++++++---

3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs ./mk
     mkdir -p ./download
     ln -s ${third-party.cjson} ./download/cjson-v1.7.16.tar.gz
-    ln -s ${third-party.acpica-unix} ./download/acpica-unix-20210331.tar.gz
+    ln -s ${third-party.acpica-unix} ./download/acpica-R06_28_23.tar.gz
   '';
 
   installPhase =
diff --git a/pkgs/embedded/embox/third-party.json b/pkgs/embedded/embox/third-party.json
@@ -1,7 +1,7 @@
 {
   "acpica-unix": {
-    "url": "http://acpica.org/sites/acpica/files/acpica-unix-20210331.tar.gz",
-    "hash": "sha256-1YSFL5MYzb5VnarSUxAgmbiaUPzPu4XzI1Ga0d6oULg="
+    "url": "https://github.com/acpica/acpica/archive/refs/tags/R06_28_23.tar.gz",
+    "hash": "sha256-Ikh5m3ygincRrIfTGSQ1TtSQR1B2B9AzvTJ7qGHsTTE="
   },
   "cjson": {
     "url": "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.16.tar.gz",
diff --git a/pkgs/misc/cadzinho/default.nix b/pkgs/misc/cadzinho/default.nix
@@ -1,16 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, SDL2, glew, lua }:
+{ lib, stdenv, fetchFromGitHub, SDL2, glew, lua, desktopToDarwinBundle }:
 
 stdenv.mkDerivation rec {
   pname = "cadzinho";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "zecruel";
     repo = "CadZinho";
     rev = version;
-    hash = "sha256-38FZsCyyUuQZS7fqZBzWWvNAkGTg36uEehtnm/RJH64=";
+    hash = "sha256-ple9Tl2thfXgW8+HtaUTAvRhkXLYTz2qx2PTAcvLI7o=";
   };
 
+  postPatch = ''
+    substituteInPlace src/gui_config.c --replace "/usr/share/cadzinho" "$out/share/cadzinho"
+  '';
+
+  nativeBuildInputs = lib.optional stdenv.isDarwin desktopToDarwinBundle;
+
   buildInputs = [ SDL2 glew lua ];
 
   makeFlags = [ "CC:=$(CC)" ];
@@ -18,7 +24,11 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-format-security";
 
   installPhase = ''
+    runHook preInstall
     install -Dm755 cadzinho -t $out/bin
+    install -Dm644 lang/*.lua -t $out/share/cadzinho/lang
+    cp -r linux/CadZinho/share/* $out/share
+    runHook postInstall
   '';
 
   meta = with lib; {
@@ -27,5 +37,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
+    mainProgram = "cadzinho";
   };
 }