diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-04 01:43:45 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-04 01:43:45 +0100 |
| commit | 44f16f33cc3951b8290f5f80a73f864e86468f6b (patch) | |
| tree | 6414afaf47f98c2eaaa6cbea9792d28ae55c258b /pkgs/data | |
| parent | 3c43b804d4b6811cbafbe506113f12e45a13e19d (diff) | |
| parent | 0c9c53ab679528cf07e8c8c1121a341030146c12 (diff) | |
| download | nixlib-44f16f33cc3951b8290f5f80a73f864e86468f6b.tar nixlib-44f16f33cc3951b8290f5f80a73f864e86468f6b.tar.gz nixlib-44f16f33cc3951b8290f5f80a73f864e86468f6b.tar.bz2 nixlib-44f16f33cc3951b8290f5f80a73f864e86468f6b.tar.lz nixlib-44f16f33cc3951b8290f5f80a73f864e86468f6b.tar.xz nixlib-44f16f33cc3951b8290f5f80a73f864e86468f6b.tar.zst nixlib-44f16f33cc3951b8290f5f80a73f864e86468f6b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/fg-virgil/default.nix | 31 | ||||
| -rw-r--r-- | pkgs/data/themes/flat-remix-gnome/default.nix | 8 |
2 files changed, 35 insertions, 4 deletions
diff --git a/pkgs/data/fonts/fg-virgil/default.nix b/pkgs/data/fonts/fg-virgil/default.nix new file mode 100644 index 000000000000..fdf83df42e03 --- /dev/null +++ b/pkgs/data/fonts/fg-virgil/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fg-virgil"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "excalidraw"; + repo = "excalidraw"; + rev = "v${finalAttrs.version}"; + hash = "sha256-iziCCHacaShPqb0f5nI8cCinFFs5fB3TcMJrifNhg4I="; + }; + + installPhase = '' + runHook preInstall + + install -D -m 444 public/Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.ttf -t $out/share/fonts/ttf + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/excalidraw/virgil"; + description = "The font that powers Excalidraw"; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ drupol ]; + license = lib.licenses.ofl; + }; +}) diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index 7a8444afbe3c..61ddd00abd30 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20230606"; + version = "20231026"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-NnCRWADyAOR5yyOjB18zSQov+5FfKhhCSkDXBAL80wo="; + hash = "sha256-sKQOq0GMslkzND2ayL5M6XIxJv8t0yj6XCP3poA6wRc="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource |