Unverified Commit ae26f291 authored by Robin Gloster's avatar Robin Gloster
Browse files

systemd: 233 -> 234

parent 21136311

pkgs/os-specific/linux/systemd/default.nix

+3 −15
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 
assert stdenv.isLinux;



stdenv.mkDerivation rec {

  version = "233";

  version = "234";

  name = "systemd-${version}";



  src = fetchFromGitHub {

    owner = "nixos";

    repo = "systemd";

    rev = "72782e7ad96f9da9b0e5873f87a64007068cee06";

    sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rjr1lbh4nkl5mcwpa";

    rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f";

    sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rja1lbh4nkl5mcwpa";

  };



  outputs = [ "out" "lib" "man" "dev" ];
@@ -99,8 +99,6 @@ stdenv.mkDerivation rec { 
        --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/



      configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")



      #export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib"

    '';



  PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
@@ -166,16 +164,6 @@ stdenv.mkDerivation rec { 


  enableParallelBuilding = true;



  /*

  # some libs fail to link to liblzma and/or libffi

  postFixup = let extraLibs = stdenv.lib.makeLibraryPath [ xz.out libffi.out zlib.out ];

    in ''

      for f in "$out"/lib/*.so.0.*; do

        patchelf --set-rpath `patchelf --print-rpath "$f"`':${extraLibs}' "$f"

      done

    '';

  */



  # The interface version prevents NixOS from switching to an

  # incompatible systemd at runtime.  (Switching across reboots is

  # fine, of course.)  It should be increased whenever systemd changes