diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 20:07:35 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 20:07:35 +0100 |
| commit | 2da31b80bb53000476b0a5ddcf7d76a44a15bfe4 (patch) | |
| tree | 9ac0bebed906a14b77141b3450e81681602b95e7 /pkgs/data | |
| parent | 092e3b50a8ff501a6ad1caf20165d2284d1ad5cb (diff) | |
| parent | 4b5b8850d81e11cb81855dbe58f4ce789d9e3893 (diff) | |
| download | nixpkgs-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar nixpkgs-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.gz nixpkgs-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.bz2 nixpkgs-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.lz nixpkgs-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.xz nixpkgs-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.zst nixpkgs-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/terminus-font/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/data/themes/mojave/default.nix | 31 |
2 files changed, 40 insertions, 11 deletions
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index c1ee2250c9a..2221f6bc6f5 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,26 +1,24 @@ { stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "terminus-font-4.46"; + pname = "terminus-font"; + version = "4.47"; + name = "${pname}-${version}"; # set here for use in URL below src = fetchurl { - url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz"; - sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf"; + url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz"; + sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg"; }; - buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; + nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; patchPhase = '' substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' ''; - configurePhase = '' - sh ./configure --prefix=$out - ''; + enableParallelBuilding = true; - installPhase = '' - make install fontdir - ''; + installTargets = [ "install" "fontdir" ]; meta = with stdenv.lib; { description = "A clean fixed width font"; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold for 8x14 and 8x16. ''; - homepage = http://www.is-vn.bg/hamster/; + homepage = http://terminus-font.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix new file mode 100644 index 00000000000..7c3c852e6af --- /dev/null +++ b/pkgs/data/themes/mojave/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "mojave-gtk-theme"; + version = "2019-01-02"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg"; + }; + + buildInputs = [ gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + patchShebangs . + mkdir -p $out/share/themes + name= ./install.sh -d $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "Mac OSX Mojave like theme for GTK based desktop environments"; + homepage = https://github.com/vinceliuice/Mojave-gtk-theme; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} |