Skip to content

Commit a3bb53b

Browse files
committed
nix: Obtain quartz src from flake
This deduplicates the src download.
1 parent 31e9643 commit a3bb53b

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

flake.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
pkgs = quartz.inputs.nixpkgs.legacyPackages.${system};
1010
stdenvs = [ { name = "gcc"; pkg = pkgs.gcc14Stdenv; } { name = "clang"; pkg = pkgs.llvmPackages_18.stdenv; } ];
1111
defaultStdenv = (builtins.head stdenvs).name;
12-
quartzCode = pkgs.fetchFromGitHub {
13-
owner = "vimpostor";
14-
repo = "quartz";
15-
rev = builtins.head (builtins.match ".*FetchContent_Declare\\(.*GIT_TAG ([[:alnum:]\\.]+).*" (builtins.readFile ./CMakeLists.txt));
16-
hash = "sha256-N4wdoZx6sQejfy/9tqtQIOcT9q9fB1DnSSnegnWDtXo=";
17-
};
1812
makeStdenvPkg = env: env.mkDerivation {
1913
pname = "blobdrop";
2014
version = builtins.head (builtins.match ".*project\\([[:alnum:]]+ VERSION ([0-9]+\.[0-9]+).*" (builtins.readFile ./CMakeLists.txt));
@@ -34,7 +28,7 @@
3428
xorg.xcbutilwm
3529
];
3630

37-
cmakeFlags = [("-DFETCHCONTENT_SOURCE_DIR_QUARTZ=" + quartzCode)];
31+
cmakeFlags = [("-DFETCHCONTENT_SOURCE_DIR_QUARTZ=" + quartz.src)];
3832
};
3933
in {
4034
packages = {

0 commit comments

Comments
 (0)