diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-02-03 19:27:21 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 19:27:21 -0300 |
| commit | 95642fb287d3ea743d0401770f0b2043646d0032 (patch) | |
| tree | 86ecbeea1f7e0b513259bc7b3faae6864680d9ed /pkgs/os-specific | |
| parent | 8d6a85aab74bbd96bb12b8078c581fbf983dbd61 (diff) | |
| parent | 71034ab59226818c69992971f5d3eeb23c93ee93 (diff) | |
| download | nixpkgs-95642fb287d3ea743d0401770f0b2043646d0032.tar nixpkgs-95642fb287d3ea743d0401770f0b2043646d0032.tar.gz nixpkgs-95642fb287d3ea743d0401770f0b2043646d0032.tar.bz2 nixpkgs-95642fb287d3ea743d0401770f0b2043646d0032.tar.lz nixpkgs-95642fb287d3ea743d0401770f0b2043646d0032.tar.xz nixpkgs-95642fb287d3ea743d0401770f0b2043646d0032.tar.zst nixpkgs-95642fb287d3ea743d0401770f0b2043646d0032.zip | |
Merge pull request #210458 from NickCao/openssl3
various: unpin openssl_1_1
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-manager/default.nix | 60 |
1 files changed, 42 insertions, 18 deletions
diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index ee36ab57442..3ae23aa5607 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,32 +1,56 @@ -{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: -rustPlatform.buildRustPackage rec { +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, xz +, pkg-config +, openssl +, dbus +, glib +, udev +, cairo +, pango +, atk +, gdk-pixbuf +, gtk3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { pname = "firmware-manager"; - version = "0.1.2"; + version = "unstable-2022-12-09"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = version; - sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc="; + rev = "9be8160346689bd74f95db7897884a91fa48afe3"; + sha256 = "sha256-zZk2RVghhKxETSVv/Jtv8Wq6+ITx/BudE/o7h4jKk5M="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; - - depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "sha256-3drsOmlmy1xXRWg7WMDNN+iuVmPYf60sDLIdCvu4rEw="; + }; postPatch = '' - sed -i 's|etc|$(prefix)/etc|' Makefile + substituteInPlace Makefile --replace '$(DESTDIR)/etc' '$(DESTDIR)$(prefix)/etc' ''; - buildPhase = "make prefix='$(out)'"; - - installPhase = "make prefix='$(out)' install"; - - cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U="; - - doCheck = false; + nativeBuildInputs = with rustPlatform; [ + rust.cargo + rust.rustc + pkg-config + cargoSetupHook + wrapGAppsHook + ]; + + buildInputs = [ + openssl + gtk3 + udev + ]; + + makeFlags = [ "prefix=$(out)" ]; meta = { description = "Graphical frontend for firmware management"; |