diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-12 18:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 18:00:58 +0000 |
| commit | 295cda2612d6b8a487f8fced27e7721e64443760 (patch) | |
| tree | 905c43ec6452712d70a8f416a41284992c752b7e /pkgs/data | |
| parent | 80180c339e5e8c7e4b9e440df777ae2fb76b1811 (diff) | |
| parent | dcd37117f653f99cd9f196a87c3ee4dfc1cb5adb (diff) | |
| download | nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.gz nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.bz2 nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.lz nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.xz nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.zst nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/data/themes/flat-remix-gtk/default.nix | 4 |
2 files changed, 11 insertions, 15 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9c9996db39e..248d076b997 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -5,12 +5,12 @@ , fetchurl , cairo , nixosTests -, python3 , pkg-config , pngquant , which , imagemagick , zopfli +, buildPackages }: let @@ -130,8 +130,8 @@ in noto-fonts-emoji = let version = "2.034"; emojiPythonEnv = - python3.withPackages (p: with p; [ fonttools nototools ]); - in stdenv.mkDerivation { + buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); + in stdenvNoCC.mkDerivation { pname = "noto-fonts-emoji"; inherit version; @@ -142,13 +142,17 @@ in sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; }; - nativeBuildInputs = [ + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config cairo + ]; + + nativeBuildInputs = [ imagemagick zopfli pngquant which - pkg-config emojiPythonEnv ]; @@ -159,14 +163,6 @@ in # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile - # Remove check for missing zopfli, it doesn't - # work and we guarantee its presence already. - sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile - sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile - - sed -i '/ZOPFLIPNG = zopflipng/d' Makefile - echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile - # Make the build verbose so it won't get culled by Hydra thinking that # it somehow got stuck doing nothing. sed -i 's;\t@;\t;' Makefile diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 59b2714285e..fec900a2d7e 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220215"; + version = "20220310"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-J9PAHQ/MbdDuX16ioQQnzZpIZs/NJVkJjLL4nfaeNkU="; + sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo="; }; dontBuild = true; |