diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/SDL2_ttf | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/SDL2_ttf')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix | 25 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix | 8 |
2 files changed, 29 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix new file mode 100644 index 000000000000..a5057c0fbec8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix @@ -0,0 +1,25 @@ +{ 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/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix index a5057c0fbec8..6975dfff24ae 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.0.15"; + version = "2.0.18"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; + sha256 = "sha256-cjTriINRTgGed0fHA+SndFdbGNQ1wipKKdBoy3aKIlE="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin darwin.libobjc; meta = with lib; { - description = "SDL TrueType library"; + description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + homepage = "https://github.com/libsdl-org/SDL_ttf"; }; } |