Merge pull request #56552 from worldofpeace/elementary-screenshot-tool/fix-conceal-text
pantheon.elementary-screenshot-tool: fix conceal text
This commit is contained in:
commit
fa64c63fa0
@ -185,6 +185,7 @@ in
|
|||||||
fonts.fonts = with pkgs; [
|
fonts.fonts = with pkgs; [
|
||||||
opensans-ttf
|
opensans-ttf
|
||||||
roboto-mono
|
roboto-mono
|
||||||
|
pantheon.elementary-redacted-script # needed by screenshot-tool
|
||||||
];
|
];
|
||||||
fonts.fontconfig.defaultFonts = {
|
fonts.fontconfig.defaultFonts = {
|
||||||
monospace = [ "Roboto Mono" ];
|
monospace = [ "Roboto Mono" ];
|
||||||
|
@ -2,12 +2,6 @@
|
|||||||
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
|
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
|
||||||
, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
|
, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
redacted-script = callPackage ./redacted-script.nix {};
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
|
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
|
||||||
version = "1.6.2";
|
version = "1.6.2";
|
||||||
@ -52,11 +46,6 @@ stdenv.mkDerivation rec {
|
|||||||
patchShebangs meson/post_install.py
|
patchShebangs meson/post_install.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $out/share/fonts/truetype
|
|
||||||
cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Screenshot tool designed for elementary OS";
|
description = "Screenshot tool designed for elementary OS";
|
||||||
homepage = https://github.com/elementary/screenshot;
|
homepage = https://github.com/elementary/screenshot;
|
||||||
|
@ -1,28 +0,0 @@
|
|||||||
{ stdenv, fetchFromGitHub, pantheon }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "elementary-redacted-script-${version}";
|
|
||||||
version = "5.1.0";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "elementary";
|
|
||||||
repo = "fonts";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "16x2w7w29k4jx2nwc5932h9rqvb216vxsziazisv2rpll74kn8b2";
|
|
||||||
};
|
|
||||||
|
|
||||||
dontConfigure = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/share/fonts/truetype/redacted-elementary
|
|
||||||
cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
description = "Redacted Script Font for elementary";
|
|
||||||
homepage = https://github.com/elementary/fonts;
|
|
||||||
license = licenses.ofl;
|
|
||||||
maintainers = pantheon.maintainers;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
@ -0,0 +1,28 @@
|
|||||||
|
{ stdenv, fetchFromGitHub, pantheon }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "elementary-redacted-script";
|
||||||
|
version = "unstable-2016-06-03";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "png2378";
|
||||||
|
repo = "redacted-elementary";
|
||||||
|
rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746";
|
||||||
|
sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1";
|
||||||
|
};
|
||||||
|
|
||||||
|
dontBuild = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/share/fonts/truetype/redacted-elementary
|
||||||
|
cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Font for concealing text";
|
||||||
|
homepage = https://github.com/png2378/redacted-elementary;
|
||||||
|
license = licenses.ofl;
|
||||||
|
maintainers = pantheon.maintainers;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
@ -217,6 +217,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||||||
|
|
||||||
elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { };
|
elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { };
|
||||||
|
|
||||||
|
elementary-redacted-script = callPackage ./artwork/elementary-redacted-script { };
|
||||||
|
|
||||||
elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { };
|
elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { };
|
||||||
|
|
||||||
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
|
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
|
||||||
|
Loading…
Reference in New Issue
Block a user