git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #56552 from worldofpeace/elementary-screenshot-tool/fix-conceal-text

pantheon.elementary-screenshot-tool: fix conceal text

commitfa64c63fa044c6173bd455e7857b9851b41df1ce authorworldofpeace <worldofpeace@users.noreply.github.com> dateSat 9 Mar 2019, 11:03 (8 years ago) parentd7f6cde59f4708
5 files changed+31−39
nixos/modules/services/x11/desktop-managers/pantheon.nix+1 pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix−11 pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix−28 pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix+28 pkgs/desktops/pantheon/default.nix+2
nixos/modules/services/x11/desktop-managers/pantheon.nix+1
@@ -185,6 +185,7 @@ in
185185 fonts.fonts = with pkgs; [
186186 opensans-ttf
187187 roboto-mono
188+ pantheon.elementary-redacted-script # needed by screenshot-tool
188189 ];
189190 fonts.fontconfig.defaultFonts = {
190191 monospace = [ "Roboto Mono" ];
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix−11
@@ -2,12 +2,6 @@
22, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
33, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
44
5−let
6−
7− redacted-script = callPackage ./redacted-script.nix {};
8−
9−in
10−
115stdenv.mkDerivation rec {
126 pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
137 version = "1.6.2";
@@ -52,11 +46,6 @@ stdenv.mkDerivation rec {
5246 patchShebangs meson/post_install.py
5347 '';
5448
55− postInstall = ''
56− mkdir -p $out/share/fonts/truetype
57− cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype
58− '';
59−
6049 meta = with stdenv.lib; {
6150 description = "Screenshot tool designed for elementary OS";
6251 homepage = https://github.com/elementary/screenshot;
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ stdenv, fetchFromGitHub, pantheon }:
2−
3−stdenv.mkDerivation rec {
4− name = "elementary-redacted-script-${version}";
5− version = "5.1.0";
6−
7− src = fetchFromGitHub {
8− owner = "elementary";
9− repo = "fonts";
10− rev = version;
11− sha256 = "16x2w7w29k4jx2nwc5932h9rqvb216vxsziazisv2rpll74kn8b2";
12− };
13−
14− dontConfigure = true;
15−
16− installPhase = ''
17− mkdir -p $out/share/fonts/truetype/redacted-elementary
18− cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary
19− '';
20−
21− meta = with stdenv.lib; {
22− description = "Redacted Script Font for elementary";
23− homepage = https://github.com/elementary/fonts;
24− license = licenses.ofl;
25− maintainers = pantheon.maintainers;
26− platforms = platforms.linux;
27− };
28−}
pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchFromGitHub, pantheon }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "elementary-redacted-script";
5+ version = "unstable-2016-06-03";
6+
7+ src = fetchFromGitHub {
8+ owner = "png2378";
9+ repo = "redacted-elementary";
10+ rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746";
11+ sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1";
12+ };
13+
14+ dontBuild = true;
15+
16+ installPhase = ''
17+ mkdir -p $out/share/fonts/truetype/redacted-elementary
18+ cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary
19+ '';
20+
21+ meta = with stdenv.lib; {
22+ description = "Font for concealing text";
23+ homepage = https://github.com/png2378/redacted-elementary;
24+ license = licenses.ofl;
25+ maintainers = pantheon.maintainers;
26+ platforms = platforms.linux;
27+ };
28+}
pkgs/desktops/pantheon/default.nix+2
@@ -217,6 +217,8 @@ lib.makeScope pkgs.newScope (self: with self; {
217217
218218 elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { };
219219
220+ elementary-redacted-script = callPackage ./artwork/elementary-redacted-script { };
221+
220222 elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { };
221223
222224 elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };