Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9b053bcd6d83
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5fbf8635e3e5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 15, 2020

  1. ckb-next: Disable built-in updater

    @ryanfitzsimon @alyssais
    ryanfitzsimon authored and alyssais committed Mar 15, 2020
    Copy the full SHA
    ea8efb2 View commit details

  2. caprice32: 4.5.0 -> 4.6.0

    @alyssais
    Bignaux Ronan authored and alyssais committed Mar 15, 2020
    Copy the full SHA
    be768d1 View commit details

  3. caprice32: enable freedesktop entries

    @alyssais
    Bignaux Ronan authored and alyssais committed Mar 15, 2020
    Copy the full SHA
    5fbf863 View commit details
Showing with 28 additions and 9 deletions.
  1. +27 −9 pkgs/misc/emulators/caprice32/default.nix
  2. +1 −0 pkgs/tools/misc/ckb-next/default.nix
36 changes: 27 additions & 9 deletions pkgs/misc/emulators/caprice32/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,47 @@
{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }:
{ stdenv, fetchFromGitHub, desktop-file-utils, libpng
, pkgconfig, SDL, freetype, zlib }:

stdenv.mkDerivation rec {

pname = "caprice32";
version = "4.5.0";
version = "4.6.0";

src = fetchFromGitHub {
repo = "caprice32";
rev = "v${version}";
owner = "ColinPitrat";
sha256 = "056vrf5yq1574g93ix8hnjqqbdqza3qcjv0f8rvpsslqcbizma9y";
sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz";
};

postPatch = "substituteInPlace cap32.cfg --replace /usr/local $out";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ desktop-file-utils pkgconfig ];
buildInputs = [ libpng SDL freetype zlib ];

#fix GIT_HASH avoid depend on git
makeFlags = [ "GIT_HASH=${src.rev}" "DESTDIR=$(out)" "prefix=/"];
makeFlags = [
"APP_PATH=${placeholder "out"}/share/caprice32"
"RELEASE=1"
"DESTDIR=${placeholder "out"}"
"prefix=/"
];

postInstall = ''
mkdir -p $out/share/icons/
mv $out/share/caprice32/resources/freedesktop/caprice32.png $out/share/icons/
mv $out/share/caprice32/resources/freedesktop/emulators.png $out/share/icons/
desktop-file-install --dir $out/share/applications \
$out/share/caprice32/resources/freedesktop/caprice32.desktop
desktop-file-install --dir $out/share/desktop-directories \
$out/share/caprice32/resources/freedesktop/Emulators.directory
install -Dm644 $out/share/caprice32/resources/freedesktop/caprice32.menu -t $out/etc/xdg/menus/applications-merged/
'';

meta = with stdenv.lib; {
description = "A complete emulation of CPC464, CPC664 and CPC6128";
homepage = https://github.com/ColinPitrat/caprice32 ;
homepage = "https://github.com/ColinPitrat/caprice32";
license = licenses.gpl2;
maintainers = [ maintainers.genesis ];
platforms = platforms.linux;
};
};
}
1 change: 1 addition & 0 deletions pkgs/tools/misc/ckb-next/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ mkDerivation rec {
"-DINSTALL_DIR_ANIMATIONS=libexec"
"-DUDEV_RULE_DIRECTORY=lib/udev/rules.d"
"-DFORCE_INIT_SYSTEM=systemd"
"-DDISABLE_UPDATER=1"
];

patches = [