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

Merge pull request #68747 from dtzWill/fix/bdf2psf-usr-env-vars

Browse Source 
bdf2psf: fix /usr/share -> /share, and don't install env-vars
This commit is contained in:
Renaud 2019-10-12 15:19:00 +02:00 committed by GitHub
commit 98b74470ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# convert bdf to psf fonts # convert bdf to psf fonts
build=$(pwd) build=$(pwd)
mkdir psf mkdir psf
cd ${bdf2psf}/usr/share/bdf2psf cd ${bdf2psf}/share/bdf2psf
for i in $bdf/*.bdf; do for i in $bdf/*.bdf; do
bdf2psf \ bdf2psf \
--fb "$i" standard.equivalents \ --fb "$i" standard.equivalents \

3
pkgs/tools/misc/bdf2psf/default.nix
View File

@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
installPhase = " installPhase = "
substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl
mv usr/bin . mv usr $out
cp -r . $out
"; ";
meta = with stdenv.lib; { meta = with stdenv.lib; {