Browse Source

firmware-manager: Init at 0.1.1

(cherry picked from commit b694eb6e6a)
wip-nanopi-m4v2
Shea Levy 6 years ago
parent
commit
6fc7532b2c
No known key found for this signature in database GPG Key ID: 5C0BD6957D86FE27
3 changed files with 44 additions and 4 deletions
  1. +4
    -4
      pkgs/build-support/rust/default.nix
  2. +38
    -0
      pkgs/os-specific/linux/firmware/firmware-manager/default.nix
  3. +2
    -0
      pkgs/top-level/all-packages.nix

+ 4
- 4
pkgs/build-support/rust/default.nix View File

@@ -29,7 +29,7 @@
, target ? null
, cargoVendorDir ? null
, checkType ? buildType
, depsExtraArgs ? {}
# Needed to `pushd`/`popd` into a subdir of a tarball if this subdir
# contains a Cargo.toml, but isn't part of a workspace (which is e.g. the
# case for `rustfmt`/etc from the `rust-sources).
@@ -43,11 +43,11 @@ assert buildType == "release" || buildType == "debug";
let

cargoDeps = if cargoVendorDir == null
then fetchCargoTarball {
then fetchCargoTarball ({
inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
patches = cargoPatches;
sha256 = cargoSha256;
}
} // depsExtraArgs)
else null;

# If we have a cargoSha256 fixed-output derivation, validate it at build time
@@ -83,7 +83,7 @@ let

in

stdenv.mkDerivation (args // {
stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // {
inherit cargoDeps;

patchRegistryDeps = ./patch-registry-deps;


+ 38
- 0
pkgs/os-specific/linux/firmware/firmware-manager/default.nix View File

@@ -0,0 +1,38 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
rustPlatform.buildRustPackage rec {
pname = "firmware-manager";
version = "0.1.1";

src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = version;
sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw";
};

nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];

depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen";

postPatch = ''
sed -i 's|etc|$(prefix)/etc|' Makefile
'';

buildPhase = "make prefix='$(out)'";

installPhase = "make prefix='$(out)' install";

cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg";

doCheck = false;

meta = {
description = "Graphical frontend for firmware management";
homepage = "https://github.com/pop-os/firmware-manager";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.shlevy ];
platforms = lib.platforms.linux;
};
}

+ 2
- 0
pkgs/top-level/all-packages.nix View File

@@ -17304,6 +17304,8 @@ in

fwupd = callPackage ../os-specific/linux/firmware/fwupd { };

firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { };

fwts = callPackage ../os-specific/linux/fwts { };

gobi_loader = callPackage ../os-specific/linux/gobi_loader { };


Loading…
Cancel
Save