From 357f6a8b7e21b901c8a5b6d3e7d425415c8c1300 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 10 Dec 2018 06:38:45 +0300 Subject: [PATCH 1/2] cernlib: fix build The imake rules contain a comment line that looks like a pragma. Recently imake in nixpkgs was switched to use tradcpp, which is a bit more strict about interpreting unknown pragmas. To fix the build, the comments is changed to use C++ style comments. --- pkgs/development/libraries/physics/cernlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index 92d2ab96232..36b385828bc 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace 2006/src/config/site.def \ --replace "# define MakeCmd gmake" "# define MakeCmd make" + substituteInPlace 2006/src/config/lnxLib.rules \ + --replace "# lib" "// lib" ''; configurePhase = '' From a1ef7fd87750dc9ff6b422b73633da0c65e653c6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 10 Dec 2018 17:05:22 +0300 Subject: [PATCH 2/2] cernlib: restrict supported arches --- pkgs/development/libraries/physics/cernlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index 36b385828bc..f01fab74635 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = http://cernlib.web.cern.ch; description = "Legacy collection of libraries and modules for data analysis in high energy physics"; broken = stdenv.isDarwin; - platforms = stdenv.lib.platforms.unix; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with stdenv.lib.maintainers; [ veprbl ]; license = stdenv.lib.licenses.gpl2; };