push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,28 @@
{
lib,
stdenv,
fetchurl,
}:
stdenv.mkDerivation rec {
pname = "amoeba-data";
version = "1.1";
src = fetchurl {
url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${version}.orig.tar.gz";
sha256 = "1bgclr1v63n14bj9nwzm5zxg48nm0cla9bq1rbd5ylxra18k0jbg";
};
installPhase = ''
mkdir -p $out/share/amoeba
cp demo.dat $out/share/amoeba/
'';
meta = with lib; {
description = "Fast-paced, polished OpenGL demonstration by Excess (data files)";
homepage = "https://packages.qa.debian.org/a/amoeba-data.html";
license = licenses.unfree;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.all;
};
}

View File

@@ -0,0 +1,70 @@
{
lib,
stdenv,
fetchurl,
amoeba-data,
alsa-lib,
expat,
freetype,
gtk3,
libvorbis,
libGLU,
xorg,
pkg-config,
installShellFiles,
}:
stdenv.mkDerivation rec {
pname = "amoeba";
version = "1.1";
debver = "31";
srcs = [
(fetchurl {
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}.orig.tar.gz";
hash = "sha256-NT6oMuAlTcVZEnYjMCF+BD+k3/w7LfWEmj6bkQln3sM=";
})
(fetchurl {
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}-${debver}.debian.tar.xz";
hash = "sha256-Ga/YeXbPXjkG/6qd9Z201d14Hlj/Je6DxgzeIQOqrWc=";
})
];
sourceRoot = "amoeba-1.1.orig";
prePatch = ''
patches="${./include-string-h.patch} $(echo ../debian/patches/*.diff)"
'';
postPatch = ''
sed -i packer/pakfile.cpp -e 's|/usr/share/amoeba|${amoeba-data}/share/amoeba|'
sed -i main/linux-config/linux-config.cpp -e 's|libgdk-x11-2.0.so.0|${gtk3}/lib/&|'
sed -i main/linux-config/linux-config.cpp -e 's|libgtk-x11-2.0.so.0|${gtk3}/lib/&|'
'';
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [
alsa-lib
expat
freetype
gtk3
libvorbis
libGLU
xorg.libXxf86vm
];
installPhase = ''
mkdir -p $out/bin
cp amoeba $out/bin/
installManPage ../debian/amoeba.1
'';
meta = with lib; {
description = "Fast-paced, polished OpenGL demonstration by Excess";
homepage = "https://packages.qa.debian.org/a/amoeba.html";
license = licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,12 @@
diff --git a/image/png_image.cpp b/image/png_image.cpp
index 37875fc..1531d6f 100644
--- a/image/png_image.cpp
+++ b/image/png_image.cpp
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <png.h>
#include "png_image.h"