diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2023-09-09 17:31:09 -0700 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2024-01-02 21:02:45 -0800 |
| commit | 5a46feaabcc21693fdbba545b377e99cc389cebd (patch) | |
| tree | 926f4e6e165dda31bbcb6be5d46ca3c9a9800e2b /pkgs/development/libraries/libbutl | |
| parent | a9867af6b4fd13fbc5ae6c7bdc43b2d6b4b32630 (diff) | |
libbutl: 0.15.0 -> 0.16.0
Diffstat (limited to 'pkgs/development/libraries/libbutl')
| -rw-r--r-- | pkgs/development/libraries/libbutl/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/libbutl/install-h-files.patch | 22 |
2 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix index 01ff0412b632c..aee951a51d6c0 100644 --- a/pkgs/development/libraries/libbutl/default.nix +++ b/pkgs/development/libraries/libbutl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , build2 +, DarwinTools , fetchurl , libuuid , enableShared ? !stdenv.hostPlatform.isStatic @@ -8,17 +9,25 @@ stdenv.mkDerivation rec { pname = "libbutl"; - version = "0.15.0"; + version = "0.16.0"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz"; - sha256 = "sha256-yzs6DFt6peJPPaMQ3rtx+kiYu7H+bUuShcdnEN90WWI="; + hash = "sha256-MGL6P/lG2sJdJXZiTcDvdy4jmU+2jYHsvaX4eEO9J2g="; }; nativeBuildInputs = [ build2 + ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools + ]; + + patches = [ + # Install missing .h files needed by dependers + # https://github.com/build2/libbutl/issues/5 + ./install-h-files.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/libbutl/install-h-files.patch b/pkgs/development/libraries/libbutl/install-h-files.patch new file mode 100644 index 0000000000000..02086ad36f5a3 --- /dev/null +++ b/pkgs/development/libraries/libbutl/install-h-files.patch @@ -0,0 +1,22 @@ +diff --git a/libbutl/buildfile b/libbutl/buildfile +index ba4ad96..f5356a1 100644 +--- a/libbutl/buildfile ++++ b/libbutl/buildfile +@@ -1,7 +1,7 @@ + # file : libbutl/buildfile + # license : MIT; see accompanying LICENSE file + +-lib{butl}: {hxx ixx txx cxx}{** -uuid-* +uuid-io \ ++lib{butl}: {h hxx ixx txx cxx}{** -uuid-* +uuid-io \ + -win32-utility \ + -mingw-* \ + -version \ +@@ -154,7 +154,7 @@ else + # Install into the libbutl/ subdirectory of, say, /usr/include/ + # recreating subdirectories. + # +-{hxx ixx txx}{*}: ++{h hxx ixx txx}{*}: + { + install = include/libbutl/ + install.subdirs = true |