diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-19 09:25:40 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-19 09:25:40 +0100 |
commit | b1cca613001028280703c67b5cbefdc0ececcfe4 (patch) | |
tree | bec9bee8c5d7c7c6e2e1929f121f4efcc3cf9102 /pkgs/development/libraries | |
parent | 711617f5e3e9087c9b193a5573d33b2063611b55 (diff) | |
parent | e149ee735e677b025058393dae69fe6df38a03e6 (diff) | |
download | nixlib-b1cca613001028280703c67b5cbefdc0ececcfe4.tar nixlib-b1cca613001028280703c67b5cbefdc0ececcfe4.tar.gz nixlib-b1cca613001028280703c67b5cbefdc0ececcfe4.tar.bz2 nixlib-b1cca613001028280703c67b5cbefdc0ececcfe4.tar.lz nixlib-b1cca613001028280703c67b5cbefdc0ececcfe4.tar.xz nixlib-b1cca613001028280703c67b5cbefdc0ececcfe4.tar.zst nixlib-b1cca613001028280703c67b5cbefdc0ececcfe4.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/flatpak/fix-paths.patch | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/freenect/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mypaint-brushes/1.0.nix | 43 | ||||
-rw-r--r-- | pkgs/development/libraries/mypaint-brushes/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/ogdf/default.nix | 43 |
6 files changed, 92 insertions, 15 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index d0d548bb8969..205bcd7c600d 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # Hardcode paths used by Flatpak itself. (substituteAll { src = ./fix-paths.patch; - p11 = p11-kit; + p11kit = "${p11-kit.dev}/bin/p11-kit"; }) # Adapt paths exposed to sandbox for NixOS. diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch index 746b4382864b..67f0d4eba71f 100644 --- a/pkgs/development/libraries/flatpak/fix-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-paths.patch @@ -7,7 +7,7 @@ index 5dd7629e..ddc71a4c 100644 int i; char *p11_argv[] = { - "p11-kit", "server", -+ "@p11@/bin/p11-kit", "server", ++ "@p11kit@", "server", /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support * this flag. This is good, because those earlier versions did not properly daemonize and caused * the spawn_sync to hang forever, waiting for the pipe to close. diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 9520542481c8..17b2a6b7c990 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6"; + sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; }; buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ] diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix new file mode 100644 index 000000000000..115d818d9365 --- /dev/null +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchpatch +, autoconf +, automake +, fetchFromGitHub +, pkgconfig +}: + +stdenv.mkDerivation rec { + pname = "mypaint-brushes"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "mypaint"; + repo = pname; + rev = "v${version}"; + sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + }; + + patches = [ + # build with automake 1.16 + (fetchpatch { + url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; + sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; + }) + ]; + + nativeBuildInputs = [ + autoconf + automake + pkgconfig + ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + homepage = "http://mypaint.org/"; + description = "Brushes used by MyPaint and other software using libmypaint."; + license = licenses.cc0; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index 115d818d9365..20caf6e57752 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -1,5 +1,4 @@ { stdenv -, fetchpatch , autoconf , automake , fetchFromGitHub @@ -8,23 +7,15 @@ stdenv.mkDerivation rec { pname = "mypaint-brushes"; - version = "1.3.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "mypaint"; repo = pname; rev = "v${version}"; - sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9"; }; - patches = [ - # build with automake 1.16 - (fetchpatch { - url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; - sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix new file mode 100644 index 000000000000..bbef1d8b93d6 --- /dev/null +++ b/pkgs/development/libraries/ogdf/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen }: + +stdenv.mkDerivation rec { + pname = "ogdf"; + version = "2020.02"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "catalpa-202002"; + sha256 = "0drrs8zh1097i5c60z9g658vs9k1iinkav8crlwk722ihfm1vxqd"; + }; + + nativeBuildInputs = [ cmake doxygen ]; + + cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-fPIC" ]; + + # Without disabling hardening for format, the build fails with + # the following error. + #> /build/source/src/coin/CoinUtils/CoinMessageHandler.cpp:766:35: error: format not a string literal and no format arguments [-Werror=format-security] + #> 766 | sprintf(messageOut_,format_+2); + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework"; + homepage = "http://www.ogdf.net"; + license = licenses.gpl2; + maintainers = [ maintainers.ianwookim ]; + platforms = platforms.i686 ++ platforms.x86_64; + longDescription = '' + OGDF stands both for Open Graph Drawing Framework (the original name) and + Open Graph algorithms and Data structures Framework. + + OGDF is a self-contained C++ library for graph algorithms, in particular + for (but not restricted to) automatic graph drawing. It offers sophisticated + algorithms and data structures to use within your own applications or + scientific projects. + + OGDF is developed and supported by Osnabrück University, TU Dortmund, + University of Cologne, University of Konstanz, and TU Ilmenau. + ''; + }; +} |