summary refs log tree commit diff
path: root/pkgs/development/libraries/science/math/lcalc/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
commitd9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch)
tree82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/development/libraries/science/math/lcalc/default.nix
parent8b834605628fabd43b1b26a1724fb22c83150e2d (diff)
parent8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff)
downloadnixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries/science/math/lcalc/default.nix')
-rw-r--r--pkgs/development/libraries/science/math/lcalc/default.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 6bbd43b0c84..e55244b2a59 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -57,6 +57,18 @@ stdenv.mkDerivation rec {
 
     # based on gentoos makefile patch -- fix paths, adhere to flags
     ./makefile.patch
+
+    # (fetchpatch {
+    #   name = "default-double.patch";
+    #   url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch";
+    #   sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla";
+    # })
+
+    (fetchpatch {
+      name = "c++11.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71";
+      sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3";
+    })
   ];
 
   installFlags = [