summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-17 17:16:52 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-17 17:16:52 +0100
commitbf2877b9ab69caa83daf4191b13d903bc82ab337 (patch)
treeab7d4f0f7ba1fccc05db97280f6d6a65ff9d6b1b /pkgs/os-specific
parent7aedd744d8a933d278429072a5edebbacdaa8a76 (diff)
parent26df2f4e9e861383e5b3f0f589c90a06e2d42b7b (diff)
downloadnixpkgs-bf2877b9ab69caa83daf4191b13d903bc82ab337.tar
nixpkgs-bf2877b9ab69caa83daf4191b13d903bc82ab337.tar.gz
nixpkgs-bf2877b9ab69caa83daf4191b13d903bc82ab337.tar.bz2
nixpkgs-bf2877b9ab69caa83daf4191b13d903bc82ab337.tar.lz
nixpkgs-bf2877b9ab69caa83daf4191b13d903bc82ab337.tar.xz
nixpkgs-bf2877b9ab69caa83daf4191b13d903bc82ab337.tar.zst
nixpkgs-bf2877b9ab69caa83daf4191b13d903bc82ab337.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/chromium-xorg-conf/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
index 58038923890..d9608650ed9 100644
--- a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
+++ b/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
@@ -1,6 +1,6 @@
-{fetchgit }:
+{ fetchFromGitiles }:
 
-fetchgit {
+fetchFromGitiles {
   name = "chromium-xorg-conf";
   url = "https://chromium.googlesource.com/chromiumos/platform/xorg-conf";
   rev = "26fb9d57e195c7e467616b35b17e2b5d279c1514";