diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:21:24 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:21:24 +0100 |
| commit | 39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4 (patch) | |
| tree | 0651b6d3fcd7eaf9c0b9c6d07d0d8253f0bd75e7 /pkgs/data | |
| parent | 5782c395d33a6e1f64b801f530695a4e485b1c20 (diff) | |
| parent | f79e10061f4e7a8988831e9734e131492e5b311f (diff) | |
| download | nixpkgs-39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4.tar nixpkgs-39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4.tar.gz nixpkgs-39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4.tar.bz2 nixpkgs-39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4.tar.lz nixpkgs-39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4.tar.xz nixpkgs-39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4.tar.zst nixpkgs-39037a3431f0f0f6dc6fdcf54811cb6db2ff91e4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/gubbi/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/data/themes/sierra/default.nix | 4 |
2 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/data/fonts/gubbi/default.nix b/pkgs/data/fonts/gubbi/default.nix new file mode 100644 index 00000000000..2d1c520e610 --- /dev/null +++ b/pkgs/data/fonts/gubbi/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, fontforge }: + +stdenv.mkDerivation rec { + pname = "gubbi-font"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "aravindavk"; + repo = "gubbi"; + rev = "v${version}"; + sha256 = "10w9i3pmjvs1b3xclrgn4q5a95ss4ipldbxbqrys2dmfivx7i994"; + }; + + nativeBuildInputs = [ fontforge ]; + + dontConfigure = true; + + preBuild = "patchShebangs generate.pe"; + + installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Gubbi.ttf"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "A Kannada font"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix index e5b5ad8d611..0c9cef9e097 100644 --- a/pkgs/data/themes/sierra/default.nix +++ b/pkgs/data/themes/sierra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sierra-gtk-theme"; - version = "2019-05-07"; + version = "2019-12-16"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq"; + sha256 = "14hlz8kbrjypyd6wyrwmnj2wm9w3kc8y00ms35ard7x8lmhs56hr"; }; nativeBuildInputs = [ libxml2 ]; |