movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse source
This commit is contained in:
John Ericson 2020-04-17 18:50:55 -04:00
commit cc880cd91f
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/mesa-glu/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "9.0.1"; version = "9.0.1";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${pname}/${pname}-${version}.tar.xz"; url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz";
sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv"; sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv";
}; };

19
pkgs/os-specific/linux/firmware/fwupdate/default.nix
View file

@ -1,6 +1,13 @@
{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: { efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }:
let let
version = "12"; version = "12";
arch =
if stdenv.hostPlatform.isx86_32
then "ia32"
else stdenv.hostPlatform.parsed.cpu.name;
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "fwupdate"; pname = "fwupdate";
inherit version; inherit version;
@ -13,7 +20,11 @@ in stdenv.mkDerivation {
./do-not-create-sharedstatedir.patch ./do-not-create-sharedstatedir.patch
]; ];
NIX_CFLAGS_COMPILE = "-I${gnu-efi}/include/efi -Wno-error=address-of-packed-member"; NIX_CFLAGS_COMPILE = builtins.toString [
"-I${gnu-efi}/include/efi"
"-I${gnu-efi}/include/efi/${arch}"
"-Wno-error=address-of-packed-member"
];
# TODO: Just apply the disable to the efi subdir # TODO: Just apply the disable to the efi subdir
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" ];
@ -41,12 +52,6 @@ in stdenv.mkDerivation {
efivar efivar
]; ];
# TODO: fix wrt cross-compilation
preConfigure = ''
arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch"
'';
postInstall = '' postInstall = ''
rm -rf $out/src rm -rf $out/src
rm -rf $out/lib/debug rm -rf $out/lib/debug