Skip to content

Commit 79c0e81

Browse files
committed
Remove raqm from flake, SDL2_ttf handles that itself
1 parent 0a4035a commit 79c0e81

File tree

2 files changed

+9
-34
lines changed

2 files changed

+9
-34
lines changed

flake.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,11 @@
4747

4848
squirrel_src.url = "github:albertodemichelis/squirrel/v3.2";
4949
squirrel_src.flake = false;
50-
51-
raqm_src.url = "github:HOST-Oman/libraqm/v0.7.2";
52-
raqm_src.flake = false;
5350
};
5451

5552
outputs = { self, nixpkgs, flake-utils,
5653
tinycmmc, sexpcpp, tinygettext, SDL2_ttf,
57-
squirrel_src, raqm_src }:
54+
squirrel_src }:
5855
flake-utils.lib.eachDefaultSystem (system:
5956
let
6057
pkgs = nixpkgs.legacyPackages.${system};
@@ -69,27 +66,6 @@
6966
];
7067
};
7168

72-
raqm = pkgs.stdenv.mkDerivation rec {
73-
pname = "libraqm";
74-
version = "0.7.2";
75-
src = raqm_src;
76-
nativeBuildInputs = [
77-
pkgs.meson
78-
pkgs.ninja
79-
pkgs.pkgconfig
80-
pkgs.python3
81-
];
82-
buildInputs = [
83-
pkgs.freetype
84-
pkgs.harfbuzz
85-
pkgs.fribidi
86-
];
87-
propagatedBuildInputs = [
88-
pkgs.glib
89-
pkgs.pcre
90-
];
91-
};
92-
9369
supertux2 = pkgs.stdenv.mkDerivation rec {
9470
pname = "supertux2";
9571
# FIXME: Should use `git describe` to get the version
@@ -126,7 +102,6 @@ EOF
126102
--prefix LD_LIBRARY_PATH ":" "${pkgs.mesa.drivers}/lib"
127103
'';
128104
buildInputs = [
129-
raqm
130105
squirrel
131106
sexpcpp.defaultPackage.${system}
132107
tinygettext.defaultPackage.${system}

0 commit comments

Comments
 (0)