cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #153395 from AndersonTorres/new-cimg

Browse source 
cimg: 2.9.9 -> 3.0.0;  fsuae: 3.0.5 -> 3.1.66; free42: 3.0.8 -> 3.0.9
This commit is contained in:
Anderson Torres 2022-01-03 22:54:27 -03:00 committed by GitHub
commit e24931ba0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 90 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/misc/free42/default.nix
View file

@ -10,17 +10,24 @@
stdenv.mkDerivation rec {
pname = "free42";
version = "3.0.8";
version = "3.0.9";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nZCuFumAyeUxRmmtd6/qvXk3LVZgbDhlsDygXMWDfp0=";
hash = "sha256-ZSwqgHsfe9apyYZ1fkvDMnQxdNb9E8U1l9jvC9t693w=";
};
nativeBuildInputs = [ copyDesktopItems pkg-config ];
buildInputs = [ gtk3 alsa-lib ];
nativeBuildInputs = [
copyDesktopItems
pkg-config
];
buildInputs = [
alsa-lib
gtk3
];
postPatch = ''
sed -i -e "s|/bin/ls|ls|" gtk/Makefile
@ -30,23 +37,24 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
make -C gtk cleaner
make --jobs=$NIX_BUILD_CORES -C gtk
make -C gtk clean
make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1
runHook postBuild
'';
preInstall = ''
installPhase = ''
runHook preInstall
install --directory $out/bin \
$out/share/doc/${pname} \
$out/share/${pname}/skins \
$out/share/icons/hicolor/48x48/apps \
$out/share/icons/hicolor/128x128/apps
'';
installPhase = ''
runHook preInstall
install -m755 gtk/free42dec gtk/free42bin $out/bin
install -m644 gtk/README $out/share/doc/${pname}/README-GTK
install -m644 README $out/share/doc/${pname}/README
@ -54,6 +62,7 @@ stdenv.mkDerivation rec {
install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps
install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps
install -m644 skins/* $out/share/${pname}/skins
runHook postInstall
'';

6
pkgs/development/libraries/cimg/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "cimg";
version = "2.9.9";
version = "3.0.0";
src = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY=";
hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg=";
};
outputs = [ "out" "doc" ];
@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples
install -m 644 CImg.h $out/include/
cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/
cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/
cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/
cp README.txt $doc/share/doc/cimg/
runHook postInstall

61
pkgs/misc/emulators/fs-uae/default.nix
View file

@ -1,21 +1,56 @@
{ lib, stdenv, fetchurl, pkg-config
, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }:
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, autoreconfHook
, freetype
, gettext
, glib
, gtk2
, libGL
, libGLU
, libmpeg2
, lua
, openal
, pkg-config
, zip
, zlib
}:
with lib;
stdenv.mkDerivation rec {
pname = "fs-uae";
version = "3.0.5";
version = "3.1.66";
src = fetchurl {
url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj";
src = fetchFromGitHub {
owner = "FrodeSolheim";
repo = pname;
rev = "v${version}";
hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
meta = {
buildInputs = [
SDL2
freetype
gettext
glib
gtk2
libGL
libGLU
libmpeg2
lua
openal
zip
zlib
];
meta = with lib; {
homepage = "https://fs-uae.net";
description = "An accurate, customizable Amiga Emulator";
longDescription = ''
FS-UAE integrates the most accurate Amiga emulation code available
@ -24,9 +59,7 @@ stdenv.mkDerivation rec {
create customized Amigas.
'';
license = licenses.gpl2Plus;
homepage = "https://fs-uae.net";
maintainers = with lib; [ maintainers.AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
# TODO: testing and Python GUI support

29
pkgs/misc/emulators/fs-uae-launcher/default.nix → pkgs/misc/emulators/fs-uae/launcher.nix
View file

@ -1,5 +1,9 @@
{ stdenv, lib, fetchurl, makeWrapper, python3, gettext
, pyqt5, setuptools, requests
{ lib
, stdenv
, fetchurl
, gettext
, makeWrapper
, python3
}:
stdenv.mkDerivation rec {
@ -11,18 +15,29 @@ stdenv.mkDerivation rec {
sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97";
};
nativeBuildInputs = [
gettext
makeWrapper
python3
];
buildInputs = with python3.pkgs; [
pyqt5
requests
setuptools
];
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ makeWrapper python3 gettext ];
buildInputs = [ pyqt5 setuptools requests ];
postInstall = ''
wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH"
'';
meta = {
meta = with lib; {
homepage = "https://fs-uae.net";
description = "Graphical front-end for the FS-UAE emulator";
license = lib.licenses.gpl2Plus;
homepage = "https://fs-uae.net";
maintainers = with lib; [ maintainers.sander ];
maintainers = with maintainers; [ sander AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -33202,9 +33202,7 @@ with pkgs;
fsuae = callPackage ../misc/emulators/fs-uae { };
fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher {
inherit (python3Packages) pyqt5 setuptools requests;
};
fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { };
putty = callPackage ../applications/networking/remote/putty {
gtk2 = gtk2-x11;