summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-01-11 21:01:38 +0100
committerlassulus <lassulus@lassul.us>2022-01-11 21:01:38 +0100
commit660846db99c51175ef6d5eedda32681292285efe (patch)
tree53f71a0e6a4596a20fbbfbb7adb984ca36778dfe
parent17892c2fa0763f31a854d5b5b8fe87a2465ad70d (diff)
parentc76269e7084ce3c07956ea04654af7eed347d703 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--krebs/5pkgs/simple/K_belwagen.nix38
-rw-r--r--krebs/5pkgs/simple/painload/default.nix12
2 files changed, 45 insertions, 5 deletions
diff --git a/krebs/5pkgs/simple/K_belwagen.nix b/krebs/5pkgs/simple/K_belwagen.nix
new file mode 100644
index 000000000..80d377b0c
--- /dev/null
+++ b/krebs/5pkgs/simple/K_belwagen.nix
@@ -0,0 +1,38 @@
+{ lib, pkgs, stdenv }:
+
+stdenv.mkDerivation {
+ pname = "K_belwagen";
+ version = "1.0";
+
+ src = pkgs.painload;
+ sourceRoot = "source/K_belwagen";
+
+ buildInputs = [
+ pkgs.jack1
+ pkgs.pkgconfig
+ ];
+
+ patchPhase = ''
+ sed -i '
+ s@^cd@# &@
+ s@^make@# &@
+ s@^jackd@# &@
+ s@^trap@# &@
+
+ s@^set.*@&\nPATH=${lib.makeBinPath [
+ pkgs.bc
+ pkgs.coreutils
+ ]}; export PATH@
+
+ s@\./a\.out@'"$out"'/lib/a.out@
+ ' alarm
+ '';
+
+ installPhase = ''
+ mkdir -p $out/lib
+ mkdir -p $out/bin
+
+ cp alarm $out/bin
+ cp a.out $out/lib
+ '';
+}
diff --git a/krebs/5pkgs/simple/painload/default.nix b/krebs/5pkgs/simple/painload/default.nix
index 3b1c83b42..e4cb11604 100644
--- a/krebs/5pkgs/simple/painload/default.nix
+++ b/krebs/5pkgs/simple/painload/default.nix
@@ -1,7 +1,9 @@
-{ fetchgit, ... }:
+{ pkgs }:
-fetchgit {
- url = https://github.com/krebs/painload;
- rev = "c113487f73713a03b1a139b22bb34b86234d0495";
- sha256 = "1irxklnmvm8wsa70ypjahkr8rfqq7357vcy8r0x1sfncs1hy6gr6";
+pkgs.fetchFromGitHub {
+ owner = "krebs";
+ repo = "painload";
+ rev = "a963b45d5a3921f19189575420cc7f8f946345b5";
+ sha256 = "03q8rxpzy4l9nd4wv0107s0ck3dhfzkfy1rabf8srabkwl0c3vsc";
+ fetchSubmodules = true;
}