diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/slib | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/slib')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/slib/default.nix | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/slib/default.nix b/nixpkgs/pkgs/development/libraries/slib/default.nix index 56c4eccf434c..91c32b5dd3a8 100644 --- a/nixpkgs/pkgs/development/libraries/slib/default.nix +++ b/nixpkgs/pkgs/development/libraries/slib/default.nix @@ -1,25 +1,35 @@ -{ fetchurl, lib, stdenv, unzip, scheme, texinfo }: +{ lib, stdenv, fetchurl, scheme, texinfo, unzip }: stdenv.mkDerivation rec { pname = "slib"; - version = "3b5"; + version = "3b7"; src = fetchurl { url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; - sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; + hash = "sha256-9dXNrTNTlaWlqjfv/iiqgHiyFuo5kR9lGSlnjxrCKLY="; }; - patches = [ ./catalog-in-library-vicinity.patch ]; + patches = [ + ./catalog-in-library-vicinity.patch + ]; - nativeBuildInputs = [ unzip ]; - buildInputs = [ scheme texinfo ]; + # slib:require unsupported feature color-database + postPatch = '' + substituteInPlace Makefile \ + --replace " clrnamdb.scm" "" + ''; + + nativeBuildInputs = [ scheme texinfo unzip ]; + buildInputs = [ scheme ]; postInstall = '' ln -s mklibcat{.scm,} SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs - sed -i "$out/bin/slib" \ - -e "/^SCHEME_LIBRARY_PATH/i export PATH=\"${scheme}/bin:\$PATH\"" + sed -i \ + -e '2i export PATH="${scheme}/bin:$PATH"' \ + -e '3i export GUILE_AUTO_COMPILE=0' \ + $out/bin/slib ''; # There's no test suite (?!). |