diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-08 13:07:23 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-08 13:08:41 +0200 |
| commit | 3609007b7c09227c0e5808c652ffafd0e14e037d (patch) | |
| tree | 69e558ca384aa90380edb69b5228d112a76b6977 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 3cc04956f3076892fae011ce26dfb21bff5856bc (diff) | |
| download | nixpkgs-3609007b7c09227c0e5808c652ffafd0e14e037d.tar nixpkgs-3609007b7c09227c0e5808c652ffafd0e14e037d.tar.gz nixpkgs-3609007b7c09227c0e5808c652ffafd0e14e037d.tar.bz2 nixpkgs-3609007b7c09227c0e5808c652ffafd0e14e037d.tar.lz nixpkgs-3609007b7c09227c0e5808c652ffafd0e14e037d.tar.xz nixpkgs-3609007b7c09227c0e5808c652ffafd0e14e037d.tar.zst nixpkgs-3609007b7c09227c0e5808c652ffafd0e14e037d.zip | |
systemd: Use our systemd repo directly
Since upstream no longer provides an autoconfed tarball, we may as well use our own repo and drop the patch.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2222d8e65d0..cc6eb989aa1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod +{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux , glib, kbd, libxslt, coreutils, libgcrypt , kexectools, libmicrohttpd, linuxHeaders, libseccomp @@ -14,17 +14,13 @@ stdenv.mkDerivation rec { version = "225"; name = "systemd-${version}"; - src = fetchurl { - url = "https://github.com/systemd/systemd/archive/v${version}.tar.gz"; - sha256 = "00cpdw52lcypiyyqxsbhfdb69yf638a8xfa95xgk3sc86sxpdxdj"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "systemd"; + rev = "72184f47631ede4cb0df44e7c96d5183ac0ea5b4"; + sha256 = "1j8rkf7x27gvaqw2jqizf62lb1850kwpb763qm11799jbf5m9l95"; }; - patches = - [ # These are all changes between upstream and - # https://github.com/NixOS/systemd/tree/nixos-${version}. - ./fixes.patch - ]; - buildInputs = [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt |