summary refs log tree commit diff
path: root/pkgs/os-specific/linux/chromium-os
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-01 08:59:35 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-09 13:42:31 +0000
commit939a8405e6fffb91d5171f73a09acdd1a9cdb964 (patch)
treef1174197544f9a00d318cc312552e6a32eba9aac /pkgs/os-specific/linux/chromium-os
parent129d329e3bcdcc972454ce284e17da16b28bd401 (diff)
downloadnixpkgs-939a8405e6fffb91d5171f73a09acdd1a9cdb964.tar
nixpkgs-939a8405e6fffb91d5171f73a09acdd1a9cdb964.tar.gz
nixpkgs-939a8405e6fffb91d5171f73a09acdd1a9cdb964.tar.bz2
nixpkgs-939a8405e6fffb91d5171f73a09acdd1a9cdb964.tar.lz
nixpkgs-939a8405e6fffb91d5171f73a09acdd1a9cdb964.tar.xz
nixpkgs-939a8405e6fffb91d5171f73a09acdd1a9cdb964.tar.zst
nixpkgs-939a8405e6fffb91d5171f73a09acdd1a9cdb964.zip
chromiumOSPackages.modemmanager-next: fix libqmi
pkgs.modemmanager already includes libqmi, it's just the wrong one.
So we should use an override to replace it.  libqmi is also not
required as a native build input, so remove it from there.

Message-Id: <20210701085935.xrhhidohyufctx6p@eve.qyliss.net>
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os')
-rw-r--r--pkgs/os-specific/linux/chromium-os/modem-manager/next.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix b/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix
index d40b2c9292e..17d95c2b3bc 100644
--- a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix
+++ b/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix
@@ -2,7 +2,7 @@
 , autoconf-archive, libqmi, libxslt
 }:
 
-modemmanager.overrideAttrs (
+(modemmanager.override { inherit libqmi; }).overrideAttrs (
   { pname, nativeBuildInputs ? [], passthru ? {}, meta ? {}, ... }:
   {
     pname = "${pname}-chromiumos-next-unstable";
@@ -12,7 +12,7 @@ modemmanager.overrideAttrs (
       upstreamInfo.components."src/third_party/modemmanager-next";
 
     nativeBuildInputs = nativeBuildInputs ++
-      [ autoreconfHook autoconf-archive libqmi libxslt ];
+      [ autoreconfHook autoconf-archive libxslt ];
 
     passthru = passthru // {
       updateScript = ../update.py;