JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56552 from worldofpeace/elementary-screenshot-tool/fix-conceal-text

Browse Source 
pantheon.elementary-screenshot-tool: fix conceal text
This commit is contained in:
worldofpeace 2019-03-09 11:03:37 -05:00 committed by GitHub
commit fa64c63fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -185,6 +185,7 @@ in
fonts.fonts = with pkgs; [
opensans-ttf
roboto-mono
pantheon.elementary-redacted-script # needed by screenshot-tool
];
fonts.fontconfig.defaultFonts = {
monospace = [ "Roboto Mono" ];

11
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
View File

@ -2,12 +2,6 @@
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
let
redacted-script = callPackage ./redacted-script.nix {};
in
stdenv.mkDerivation rec {
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
version = "1.6.2";
@ -52,11 +46,6 @@ stdenv.mkDerivation rec {
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; {
description = "Screenshot tool designed for elementary OS";
homepage = https://github.com/elementary/screenshot;

28
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
View File

@ -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;
};
}

28
pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix Normal file
View File

@ -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;
};
}

2
pkgs/desktops/pantheon/default.nix
View File

@ -217,6 +217,8 @@ lib.makeScope pkgs.newScope (self: with self; {
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-wallpapers = callPackage ./artwork/elementary-wallpapers { };