diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-07 08:07:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-07 08:07:10 +0200 |
| commit | 8f5edef47e2d7d3667148d7ea8122fb4ec6794d1 (patch) | |
| tree | 3e5f880f656613c5fdd611ec7303d77162788d2d /pkgs/os-specific | |
| parent | 276dc23b614ce30cf628cbbf1f222efdeafb8cb9 (diff) | |
| parent | 326148ec9bb5e5d93c23e720287f000f76ab2cae (diff) | |
| download | nixpkgs-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar nixpkgs-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.gz nixpkgs-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.bz2 nixpkgs-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.lz nixpkgs-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.xz nixpkgs-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.zst nixpkgs-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.zip | |
Merge branch 'staging-next' (PR #62209)
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-lib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 3c3fbc6e797..8dcddf4baf9 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -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 = [ diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9d95269daa9..84890b56916 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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" |