diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
| commit | f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (patch) | |
| tree | 0f17999d3a5444f16f09e0c1d7f3075e0224e731 /pkgs/os-specific/linux/criu | |
| parent | 3f45f0948d6fe158bed063adb66850ded0ba4861 (diff) | |
| parent | c61445357e2a92470bee43a71a10baef1a3196e4 (diff) | |
| download | nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.gz nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.bz2 nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.lz nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.xz nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.zst nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific/linux/criu')
| -rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 6567e478636..919799abb69 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "--skip-validation" "--skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" + substituteInPlace ./Makefile --replace "-Werror" "" ''; configurePhase = "make config PREFIX=$out"; @@ -31,11 +32,11 @@ stdenv.mkDerivation rec { make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto ''; - meta = { - description = "userspace checkpoint/restore for Linux"; - homepage = "http://criu.org"; - license = stdenv.lib.licenses.gpl2; + meta = with stdenv.lib; { + description = "Userspace checkpoint/restore for Linux"; + homepage = https://criu.org; + license = licenses.gpl2; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = [ maintainers.thoughtpolice ]; }; } |