summary refs log tree commit diff
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2017-07-31 16:29:18 +0100
committerGabriel Ebner <gebner@gebner.org>2017-07-31 16:29:39 +0100
commitb94da10c2727195e66f5c971be41c3280f01e69c (patch)
tree76c43baec77bf6f1e29d2cf5618c17398ff9cf43
parent4f901203e8d1a0ded90a73e2670ce493ed051299 (diff)
downloadnixpkgs-b94da10c2727195e66f5c971be41c3280f01e69c.tar
nixpkgs-b94da10c2727195e66f5c971be41c3280f01e69c.tar.gz
nixpkgs-b94da10c2727195e66f5c971be41c3280f01e69c.tar.bz2
nixpkgs-b94da10c2727195e66f5c971be41c3280f01e69c.tar.lz
nixpkgs-b94da10c2727195e66f5c971be41c3280f01e69c.tar.xz
nixpkgs-b94da10c2727195e66f5c971be41c3280f01e69c.tar.zst
nixpkgs-b94da10c2727195e66f5c971be41c3280f01e69c.zip
libqalculate, qalculate-gtk: 0.9.9 -> 1.0.0
-rw-r--r--pkgs/applications/science/math/qalculate-gtk/default.nix10
-rw-r--r--pkgs/development/libraries/libqalculate/default.nix4
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 5f49b240fc0..cd89fbbe187 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "qalculate-gtk-${version}";
-  version = "0.9.9";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
-    sha256 = "0v9ibycilygmi9zzi7cxif7si56c85lfzdvbqnbf32whg8ydqqkg";
+    sha256 = "08sg6kfcfdpxjsl538ba26ncm2cxzc63nlafj99ff4b46wxia57k";
   };
 
+  patchPhase = ''
+    for fn in src/interface.cc src/main.cc; do
+      substituteInPlace $fn --replace 'getPackageDataDir().c_str()' \"$out/share\"
+    done
+  '';
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ];
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index abc0eb4a228..2e748d26689 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libqalculate-${version}";
-  version = "0.9.10";
+  version = "1.0.0a";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
-    sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi";
+    sha256 = "12igmd1rn6zwrsg0mmn5pwy2bqj2gmc08iry0vcdxgzi7jc9x7ix";
   };
 
   outputs = [ "out" "dev" "doc" ];