From ce57dd627dbe1a1bdada9ec5b0e553705604c036 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 22 Jun 2023 08:04:55 -0400 Subject: [PATCH 1/5] linthesia: formatting --- pkgs/games/linthesia/default.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index 0914722a9acb..5d7854d407f4 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, libGL, libGLU -, alsa-lib, glibmm, sqlite, SDL2, SDL2_ttf_2_0_15, SDL2_image, gtk3, wrapGAppsHook }: +{ lib +, SDL2 +, SDL2_image +, SDL2_ttf_2_0_15 +, alsa-lib +, fetchFromGitHub +, glibmm +, gtk3 +, libGL +, libGLU +, meson +, ninja +, pkg-config +, python3 +, sqlite +, stdenv +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "linthesia"; From 4340a53bf39332ef13fd133b22077959900d3d45 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 22 Jun 2023 08:06:33 -0400 Subject: [PATCH 2/5] linthesia: use latest SDL2_ttf via backport Upstream commit is merged to main but not in release yet. --- pkgs/games/linthesia/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index 5d7854d407f4..32a0902403ca 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -1,9 +1,10 @@ { lib , SDL2 , SDL2_image -, SDL2_ttf_2_0_15 +, SDL2_ttf , alsa-lib , fetchFromGitHub +, fetchpatch2 , glibmm , gtk3 , libGL @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-bdW0RlV14ttnK8NizfNfXmZ7zlJOqZCpVvt8vT2Pjys="; }; + patches = [ + # fix: text looks garbled with SDL2_ttf 2.0.18 + (fetchpatch2 { + url = "https://github.com/linthesia/linthesia/commit/bd647270b3bdf79a9af6ac1e2203c9e860d16c58.patch"; + hash = "sha256-hNal0eVfikRSpW+MOfpKvnWXrEJgIXHPAtNPB9SvHVU="; + }) + ]; + postPatch = '' patchShebangs meson_post_install.py ''; @@ -40,7 +49,7 @@ stdenv.mkDerivation rec { glibmm sqlite SDL2 - SDL2_ttf_2_0_15 + SDL2_ttf SDL2_image gtk3.out # icon cache ]; From c05e2c1cbd9a5ab8d1477b1fd0a2480d6fe147ee Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 22 Jun 2023 08:07:32 -0400 Subject: [PATCH 3/5] SDL2_ttf_2_0_15: remove as it is unused --- .../development/libraries/SDL2_ttf/2.0.15.nix | 25 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/libraries/SDL2_ttf/2.0.15.nix diff --git a/pkgs/development/libraries/SDL2_ttf/2.0.15.nix b/pkgs/development/libraries/SDL2_ttf/2.0.15.nix deleted file mode 100644 index a5057c0fbec8..000000000000 --- a/pkgs/development/libraries/SDL2_ttf/2.0.15.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }: - -stdenv.mkDerivation rec { - pname = "SDL2_ttf"; - version = "2.0.15"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; - }; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ SDL2 freetype libGL ] - ++ lib.optional stdenv.isDarwin darwin.libobjc; - - meta = with lib; { - description = "SDL TrueType library"; - platforms = platforms.unix; - license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_ttf/"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c8dd4185d7..161153756076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24406,8 +24406,6 @@ with pkgs; SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; - SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; - sdrplay = callPackage ../applications/radio/sdrplay { }; sdrpp = callPackage ../applications/radio/sdrpp { From 563c856ea8a1fdcafb07e6372161be81f3782ba4 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 11 Jul 2023 18:13:54 -0400 Subject: [PATCH 4/5] linthesia: 0.8.0 -> unstable-2023-05-23 --- pkgs/games/linthesia/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index 32a0902403ca..c95d81387534 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -4,7 +4,6 @@ , SDL2_ttf , alsa-lib , fetchFromGitHub -, fetchpatch2 , glibmm , gtk3 , libGL @@ -20,23 +19,15 @@ stdenv.mkDerivation rec { pname = "linthesia"; - version = "0.8.0"; + version = "unstable-2023-05-23"; src = fetchFromGitHub { owner = "linthesia"; repo = "linthesia"; - rev = version; - sha256 = "sha256-bdW0RlV14ttnK8NizfNfXmZ7zlJOqZCpVvt8vT2Pjys="; + rev = "1f2701241f8865c2f5c14a97b81ae64884cf0396"; + sha256 = "sha256-3uPcpDUGtAGW9q/u8Cn+0bNqikII1Y/a0PKARW/5nao="; }; - patches = [ - # fix: text looks garbled with SDL2_ttf 2.0.18 - (fetchpatch2 { - url = "https://github.com/linthesia/linthesia/commit/bd647270b3bdf79a9af6ac1e2203c9e860d16c58.patch"; - hash = "sha256-hNal0eVfikRSpW+MOfpKvnWXrEJgIXHPAtNPB9SvHVU="; - }) - ]; - postPatch = '' patchShebangs meson_post_install.py ''; From 9d6ad87ccd9056f59bcd5df6046d24330f3f6426 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 11 Jul 2023 18:14:44 -0400 Subject: [PATCH 5/5] linthesia: add ckie as maintainer Per https://github.com/NixOS/nixpkgs/pull/239186#issuecomment-1615928290 --- pkgs/games/linthesia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index c95d81387534..0fd252e7ba5d 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with maintainers; [ ckie ]; }; }