mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-14 15:47:48 +00:00
Merge pull request #239186 from amarshall/sdl_ttf
This commit is contained in:
commit
e50cf6ca92
@ -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/";
|
||||
};
|
||||
}
|
@ -1,15 +1,31 @@
|
||||
{ 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
|
||||
, alsa-lib
|
||||
, fetchFromGitHub
|
||||
, glibmm
|
||||
, gtk3
|
||||
, libGL
|
||||
, libGLU
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, sqlite
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
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=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -24,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
glibmm
|
||||
sqlite
|
||||
SDL2
|
||||
SDL2_ttf_2_0_15
|
||||
SDL2_ttf
|
||||
SDL2_image
|
||||
gtk3.out # icon cache
|
||||
];
|
||||
@ -34,5 +50,6 @@ stdenv.mkDerivation rec {
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user