diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 21:45:37 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-17 23:26:08 +0700 |
commit | 16d91ee628d781c721506b19e3e03bed810327e8 (patch) | |
tree | f65e50a70b4ff72314f384c6b29f4902b03f45f3 /pkgs/os-specific/linux/firmware/fwupd/default.nix | |
parent | 979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff) | |
download | nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.gz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.bz2 nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.lz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.xz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.zst nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.zip |
pkgs/os-specific: stdenv.lib -> lib
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 25e0e6b0d88..5c40a5540dc 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -160,7 +160,7 @@ let pango tpm2-tss efivar - ] ++ stdenv.lib.optionals haveDell [ + ] ++ lib.optionals haveDell [ libsmbios ]; @@ -187,12 +187,12 @@ let # Our builder only adds $lib/lib to rpath but some things link # against libfwupdplugin which is in $out/lib. "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" - ] ++ stdenv.lib.optionals (!haveDell) [ + ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=false" "-Dplugin_synaptics=false" - ] ++ stdenv.lib.optionals (!haveRedfish) [ + ] ++ lib.optionals (!haveRedfish) [ "-Dplugin_redfish=false" - ] ++ stdenv.lib.optionals haveFlashrom [ + ] ++ lib.optionals haveFlashrom [ "-Dplugin_flashrom=true" ]; @@ -250,12 +250,12 @@ let efibootmgr bubblewrap tpm2-tools - ] ++ stdenv.lib.optional haveFlashrom flashrom; + ] ++ lib.optional haveFlashrom flashrom; in '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" # See programs reached with fu_common_find_program_in_path in source - --prefix PATH : "${stdenv.lib.makeBinPath binPath}" + --prefix PATH : "${lib.makeBinPath binPath}" ) ''; @@ -291,7 +291,7 @@ let "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" - ] ++ stdenv.lib.optionals haveDell [ + ] ++ lib.optionals haveDell [ "fwupd/remotes.d/dell-esrt.conf" ]; @@ -302,7 +302,7 @@ let ]; tests = let - listToPy = list: "[${stdenv.lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; + listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; in { installedTests = nixosTests.installed-tests.fwupd; |