Skip to content

Commit 0a4035a

Browse files
committed
Use Nix flake inputs for squirrel and raqm
1 parent fb9bb0d commit 0a4035a

File tree

2 files changed

+47
-10
lines changed

2 files changed

+47
-10
lines changed

flake.lock

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

flake.nix

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,17 @@
4444
SDL2_ttf.url = "github:SuperTux/SDL_ttf";
4545
SDL2_ttf.inputs.nixpkgs.follows = "nixpkgs";
4646
SDL2_ttf.inputs.flake-utils.follows = "flake-utils";
47+
48+
squirrel_src.url = "github:albertodemichelis/squirrel/v3.2";
49+
squirrel_src.flake = false;
50+
51+
raqm_src.url = "github:HOST-Oman/libraqm/v0.7.2";
52+
raqm_src.flake = false;
4753
};
4854

49-
outputs = { self, nixpkgs, flake-utils, tinycmmc, sexpcpp, tinygettext, SDL2_ttf }:
55+
outputs = { self, nixpkgs, flake-utils,
56+
tinycmmc, sexpcpp, tinygettext, SDL2_ttf,
57+
squirrel_src, raqm_src }:
5058
flake-utils.lib.eachDefaultSystem (system:
5159
let
5260
pkgs = nixpkgs.legacyPackages.${system};
@@ -55,11 +63,7 @@
5563
squirrel = pkgs.stdenv.mkDerivation {
5664
pname = "squirrel";
5765
version = "3.2";
58-
src = pkgs.fetchgit {
59-
url = "https://github.com/albertodemichelis/squirrel.git";
60-
rev = "v3.2";
61-
hash = "sha256-vzAF0ooYoghw0yKKoS0Q6RnPPMhmP+05RoutVSZIGwk=";
62-
};
66+
src = squirrel_src;
6367
nativeBuildInputs = [
6468
pkgs.cmake
6569
];
@@ -68,10 +72,7 @@
6872
raqm = pkgs.stdenv.mkDerivation rec {
6973
pname = "libraqm";
7074
version = "0.7.2";
71-
src = fetchTarball {
72-
url = "https://github.com/HOST-Oman/libraqm/releases/download/v${version}/raqm-${version}.tar.xz";
73-
sha256 = "1shcs5l27l7380dvacvhl8wrdq3lix0wnhzvfdh7vx2pkzjs3zk6";
74-
};
75+
src = raqm_src;
7576
nativeBuildInputs = [
7677
pkgs.meson
7778
pkgs.ninja

0 commit comments

Comments
 (0)