public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' (PR #62209)

Browse Source
This commit is contained in:
Vladimír Čunát
2019-06-07 08:07:10 +02:00
parent 276dc23b61 326148ec9b
commit 8f5edef47e
50 changed files with 282 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/alsa-lib/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "alsa-lib-1.1.8";
name = "alsa-lib-1.1.9";
src = fetchurl {
url = "mirror://alsa/lib/${name}.tar.bz2";
sha256 = "1pxf0zkmps03l3zzd0fr828xhkg6a8hxljmbxzc2cyj2ls9kmp1w";
sha256 = "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8";
};
patches = [

2
pkgs/os-specific/linux/systemd/default.nix
View File

@@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {
"-Dsystem-gid-max=499"
# "-Dtime-epoch=1"
(if stdenv.isAarch32 || stdenv.isAarch64 || !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
(if !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
"-Defi-libdir=${toString gnu-efi}/lib"
"-Defi-includedir=${toString gnu-efi}/include/efi"
"-Defi-ldsdir=${toString gnu-efi}/lib"