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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-01 18:31:04 +00:00
committed by GitHub
parent f602c10ea7 eca8c09a50
commit 7044cd0c9d
113 changed files with 881 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/data/documentation/anarchism/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, xdg_utils }:
{ lib, stdenv, fetchFromGitLab, xdg-utils }:
stdenv.mkDerivation rec {
pname = "anarchism";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace debian/anarchism.desktop \
--replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open"
--replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
substituteInPlace debian/anarchism.desktop \
--replace "file:///usr" "file://$out"
'';

2
pkgs/data/fonts/inconsolata/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
inherit (google-fonts) src version;
installPhase = ''
install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf
install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf
'';
meta = with lib; {