From d1e5d5012fdad05935662ef47865ad956db4ed53 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Sep 2020 03:10:13 -0300 Subject: Netsurf libnslog: 0.1.2 -> 0.1.3 --- .../applications/misc/netsurf/libnslog/default.nix | 33 ---------------------- .../networking/browsers/netsurf/default.nix | 1 + .../networking/browsers/netsurf/libnslog.nix | 30 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/misc/netsurf/libnslog/default.nix create mode 100644 pkgs/applications/networking/browsers/netsurf/libnslog.nix (limited to 'pkgs') diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/pkgs/applications/misc/netsurf/libnslog/default.nix deleted file mode 100644 index 43b4622ab03a9..0000000000000 --- a/pkgs/applications/misc/netsurf/libnslog/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex -, buildsystem -}: - -stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; - libname = "libnslog"; - version = "0.1.2"; - - src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd"; - }; - - nativeBuildInputs = [ pkgconfig bison flex ]; - buildInputs = [ - buildsystem - ]; - - makeFlags = [ - "PREFIX=$(out)" - "NSSHARED=${buildsystem}/share/netsurf-buildsystem" - ]; - - meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "NetSurf Parametric Logging Library"; - license = licenses.mit; - maintainers = [ maintainers.samueldr ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index cc97ea658e4a2..db55e40265757 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -4,5 +4,6 @@ lib.makeScope pkgs.newScope (self: with self; { buildsystem = callPackage ./buildsystem.nix { }; libnsbmp = callPackage ./libnsbmp.nix { }; libnsgif = callPackage ./libnsgif.nix { }; + libnslog = callPackage ./libnslog.nix { }; libparserutils = callPackage ./libparserutils.nix { }; }) diff --git a/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix new file mode 100644 index 0000000000000..12fdcff50bd30 --- /dev/null +++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, bison, flex +, buildsystem +}: + +stdenv.mkDerivation rec { + pname = "netsurf-${libname}"; + libname = "libnslog"; + version = "0.1.3"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; + }; + + nativeBuildInputs = [ pkgconfig bison flex ]; + buildInputs = [ buildsystem ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.netsurf-browser.org/"; + description = "NetSurf Parametric Logging Library"; + license = licenses.isc; + maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} -- cgit 1.4.1