swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

fwupd: Remove manual rpath settings now that meson is fixed.

Browse source 
Thanks @yegortimoshenko!
This commit is contained in:
Shea Levy 2017-10-29 14:42:55 -04:00
parent f04f30fd2d
commit 9e37df185c
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
2 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/build-managers/meson/default.nix
View file

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py
'';
setupHook = ./setup-hook.sh;
setupHook = ./setup-hook.sh;
meta = with lib; {
homepage = http://mesonbuild.com;

31
pkgs/os-specific/linux/firmware/fwupd/default.nix
View file

@ -1,30 +1,10 @@
{ stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive
, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar
, fwupdate, libgpgerror, libyaml, valgrind, meson, libuuid, pygobject3
, pillow, ninja, gcab, makeWrapper, glib, gdk_pixbuf
, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3
, pillow, ninja, gcab
}:
let version = "0.9.6";
rpath = stdenv.lib.makeLibraryPath
[ libuuid.out
appstream-glib
glib
libsoup
gdk_pixbuf
libarchive.lib
gcab
sqlite.out
gusb
polkit.out
gpgme
libgpgerror
libelf
efivar
libsmbios
fwupdate
libgudev
"$out"
];
in
stdenv.mkDerivation
{ name = "fwupd-${version}";
@ -36,18 +16,13 @@ in
[ gtk_doc pkgconfig gobjectIntrospection intltool libgudev
polkit appstream-glib gusb sqlite libarchive libsoup
docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
meson gpgme libuuid pygobject3 pillow ninja gcab makeWrapper
meson gpgme libuuid pygobject3 pillow ninja gcab
];
patches = [ ./fix-missing-deps.patch ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar"
'';
mesonFlags = [ "-Denable-colorhug=false" "-Denable-man=false" "-Denable-tests=false" "--localstatedir=/var" "-Denable-doc=false" "-Dwith-bootdir=/boot" ];
postFixup = ''
for prog in $out/bin/* $out/libexec/fwupd/*; do
wrapProgram "$prog" --prefix LD_LIBRARY_PATH : ${rpath}
done
'';
enableParallelBuilding = true;
meta =
{ license = [ stdenv.lib.licenses.gpl2 ];