nixpkgs 2023-11-14 -> 2023-11-17
``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/bf744fe90419885eefced41b3e5ae442d732712d' (2023-11-14) → 'github:nixos/nixpkgs/c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad' (2023-11-17) ```
This commit is contained in:
parent
52b59bcde8
commit
a1298d6cda
|
@ -53,11 +53,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unpatched": {
|
"nixpkgs-unpatched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699963925,
|
"lastModified": 1700204040,
|
||||||
"narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
|
"narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bf744fe90419885eefced41b3e5ae442d732712d",
|
"rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -24,9 +24,15 @@ let
|
||||||
);
|
);
|
||||||
in [
|
in [
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
title = "animatch: init at 1.0.3";
|
# build fix: merged 2023/11/17
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/267948";
|
title = "python2/mk-python-derivation: disable catchConflictsHook";
|
||||||
hash = "sha256-zWu/n9eiMiwWcMOzly8AdqzGwYLVaFnsWu+XR4XYsD4=";
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/268027";
|
||||||
|
hash = "sha256-jw12uh6Tfyu2lp37YFMg8XLOoe5D1pez66whYwr6l3I=";
|
||||||
|
})
|
||||||
|
(fetchpatch' {
|
||||||
|
title = "libaom: fix cross";
|
||||||
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/266257";
|
||||||
|
hash = "sha256-9VQcM/9gptTz2BCwvSbxrDuHVN69cL77NzHexudqAiM=";
|
||||||
})
|
})
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
title = "gcr: remove build gnupg from runtime closure";
|
title = "gcr: remove build gnupg from runtime closure";
|
||||||
|
@ -55,22 +61,17 @@ in [
|
||||||
# prUrl = "https://github.com/NixOS/nixpkgs/pull/262268";
|
# prUrl = "https://github.com/NixOS/nixpkgs/pull/262268";
|
||||||
# hash = "sha256-TxQiR+OS4YriLNViTg4H78Z3f3IjBVodiFAkOUCeNic=";
|
# hash = "sha256-TxQiR+OS4YriLNViTg4H78Z3f3IjBVodiFAkOUCeNic=";
|
||||||
# })
|
# })
|
||||||
(fetchpatch' {
|
|
||||||
# merged *into staging* 2023/10/05
|
|
||||||
title = "mesa: don't depend on build python";
|
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/259109";
|
|
||||||
hash = "sha256-uSTWxAFPasx7MwNimqypUln9lowh+W3dMb5b+gM9kd0=";
|
|
||||||
})
|
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
title = "rpm: 4.18.1 -> 4.19.0";
|
title = "rpm: 4.18.1 -> 4.19.0";
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/260558";
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/260558";
|
||||||
hash = "sha256-FDY/OLh7bNRixEuPlrIeyW/kJYNPnelLsplfKCsjHKQ=";
|
hash = "sha256-FDY/OLh7bNRixEuPlrIeyW/kJYNPnelLsplfKCsjHKQ=";
|
||||||
})
|
})
|
||||||
(fetchpatch' {
|
# (fetchpatch' {
|
||||||
title = "zcash: 5.4.2 -> 5.7.0";
|
# # doesn't apply cleanly. use build result in <working/zcash>
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/229810";
|
# title = "zcash: 5.4.2 -> 5.7.0";
|
||||||
hash = "sha256-ProoPJ10rUtOZh2PzpegviG6Ip1zSuWC92BpP+ux9ZQ=";
|
# prUrl = "https://github.com/NixOS/nixpkgs/pull/229810";
|
||||||
})
|
# hash = "sha256-ProoPJ10rUtOZh2PzpegviG6Ip1zSuWC92BpP+ux9ZQ=";
|
||||||
|
# })
|
||||||
# (fetchpatch' {
|
# (fetchpatch' {
|
||||||
# title = "graphicsmagick: 1.3.39 -> 1.3.42";
|
# title = "graphicsmagick: 1.3.39 -> 1.3.42";
|
||||||
# prUrl = "https://github.com/NixOS/nixpkgs/pull/218163";
|
# prUrl = "https://github.com/NixOS/nixpkgs/pull/218163";
|
||||||
|
|
|
@ -1,59 +0,0 @@
|
||||||
{ lib, stdenv
|
|
||||||
, allegro5
|
|
||||||
, cmake
|
|
||||||
, fetchFromGitLab
|
|
||||||
, libGL
|
|
||||||
, libwebp
|
|
||||||
, xorg
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
allegro' = allegro5.overrideAttrs (base: {
|
|
||||||
# TODO: patch upstream nixpkgs' allegro5 to have this enabled
|
|
||||||
buildInputs = base.buildInputs ++ [
|
|
||||||
libwebp
|
|
||||||
];
|
|
||||||
});
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
pname = "animatch";
|
|
||||||
version = "1.0.3";
|
|
||||||
src = fetchFromGitLab {
|
|
||||||
owner = "HolyPangolin";
|
|
||||||
repo = "animatch";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
cmake
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
allegro'
|
|
||||||
libGL
|
|
||||||
xorg.libX11
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DLIBSUPERDERPY_STATIC=ON" # recommended by upstream for coexistence with other superderpy games
|
|
||||||
];
|
|
||||||
|
|
||||||
# debugging:
|
|
||||||
# NIX_CFLAGS_COMPILE = "-Og -ggdb";
|
|
||||||
# dontStrip = true;
|
|
||||||
#
|
|
||||||
# run with:
|
|
||||||
# SDL_VIDEODRIVER=wayland animatch --debug --windowed
|
|
||||||
meta = {
|
|
||||||
homepage = "https://gitlab.com/HolyPangolin/animatch/";
|
|
||||||
description = "a match-three game with cute animals";
|
|
||||||
longDescription = ''
|
|
||||||
The game was made for [Purism, SPC](https://puri.sm/)
|
|
||||||
by [Holy Pangolin](https://holypangolin.com/) studio,
|
|
||||||
consisting of [Agata Nawrot](https://agatanawrot.com/)
|
|
||||||
and [Sebastian Krzyszkowiak](https://dosowisko.net/).
|
|
||||||
'';
|
|
||||||
license = with lib.licenses; [ gpl3Plus ];
|
|
||||||
maintainers = with lib.maintainers; [ colinsane ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -21,7 +21,6 @@ let
|
||||||
|
|
||||||
### ADDITIONAL PACKAGES
|
### ADDITIONAL PACKAGES
|
||||||
alsa-ucm-conf-sane = callPackage ./additional/alsa-ucm-conf-sane { };
|
alsa-ucm-conf-sane = callPackage ./additional/alsa-ucm-conf-sane { };
|
||||||
animatch = unpatched.animatch or (callPackage ./additional/animatch { });
|
|
||||||
# TODO: move target flags to upstream PR and re-enable this bonsai
|
# TODO: move target flags to upstream PR and re-enable this bonsai
|
||||||
# bonsai = unpatched.bonsai or (callPackage ./additional/bonsai { });
|
# bonsai = unpatched.bonsai or (callPackage ./additional/bonsai { });
|
||||||
bonsai = callPackage ./additional/bonsai { };
|
bonsai = callPackage ./additional/bonsai { };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user