summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-08-04 17:44:22 +0200
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-08-04 17:44:22 +0200
commit37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb (patch)
tree387e0f3f2119968a27cc468c2d54a45121d876c0
parent37f3ebe498315da84c50cfa6f5e64df46a9d0b87 (diff)
downloadnixpkgs-37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb.tar
nixpkgs-37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb.tar.gz
nixpkgs-37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb.tar.bz2
nixpkgs-37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb.tar.lz
nixpkgs-37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb.tar.xz
nixpkgs-37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb.tar.zst
nixpkgs-37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb.zip
guile-xcb: 1.3 -> unstable-2017-05-29
-rw-r--r--pkgs/development/guile-modules/guile-xcb/default.nix12
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
index d009901bbf2..19a790db77a 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, autoreconfHook
 , guile
 , pkg-config
 , texinfo
@@ -8,16 +9,17 @@
 
 stdenv.mkDerivation rec {
   pname = "guile-xcb";
-  version = "1.3";
+  version = "unstable-2017-05-29";
 
   src = fetchFromGitHub {
     owner = "mwitmer";
     repo = pname;
-    rev = version;
-    hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs=";
+    rev = "db7d5a393cc37a56f66541b3f33938b40c6f35b3";
+    hash = "sha256-zbIsEIPwNJ1YXMZTDw2DfzufC+IZWfcWgZHbuv7bhJs=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     pkg-config
   ];
   buildInputs = [
@@ -30,6 +32,10 @@ stdenv.mkDerivation rec {
     "--with-guile-site-ccache-dir=$out/share/guile/site"
   ];
 
+  makeFlags = [
+    "GUILE_AUTO_COMPILE=0"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/mwitmer/guile-xcb";
     description = "XCB bindings for Guile";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 373b7c21fcf..e6c37f1715c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18069,7 +18069,7 @@ with pkgs;
   guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
 
   guile-xcb = callPackage ../development/guile-modules/guile-xcb {
-    guile = guile_2_0;
+    guile = guile_2_2;
   };
 
   inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };