diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-27 09:57:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 09:57:15 +0300 |
| commit | 2301b120c1929439323dfd4e40c82eca3c9964b0 (patch) | |
| tree | d12023be550453b62fb400e4c0301b9bea008776 /pkgs/development/guile-modules | |
| parent | 6e40bbbd4774d2d7fbf9fed9c28763de214a9107 (diff) | |
| parent | 08070c94d93c7570dc8cedf6fb8097a5eed7f4e9 (diff) | |
| download | nixpkgs-2301b120c1929439323dfd4e40c82eca3c9964b0.tar nixpkgs-2301b120c1929439323dfd4e40c82eca3c9964b0.tar.gz nixpkgs-2301b120c1929439323dfd4e40c82eca3c9964b0.tar.bz2 nixpkgs-2301b120c1929439323dfd4e40c82eca3c9964b0.tar.lz nixpkgs-2301b120c1929439323dfd4e40c82eca3c9964b0.tar.xz nixpkgs-2301b120c1929439323dfd4e40c82eca3c9964b0.tar.zst nixpkgs-2301b120c1929439323dfd4e40c82eca3c9964b0.zip | |
Merge pull request #256543 from foo-dogsquared/update-guile-lib
Diffstat (limited to 'pkgs/development/guile-modules')
| -rw-r--r-- | pkgs/development/guile-modules/guile-lib/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 2678bcb2c05..75e45b00d4e 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, autoreconfHook , guile , pkg-config , texinfo @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + autoreconfHook pkg-config ]; buildInputs = [ @@ -23,6 +25,12 @@ stdenv.mkDerivation rec { texinfo ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ + --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' + ''; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; doCheck = !stdenv.isDarwin; @@ -43,7 +51,7 @@ stdenv.mkDerivation rec { for Guile". ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = with maintainers; [ vyp foo-dogsquared ]; platforms = guile.meta.platforms; }; } |