diff options
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | fmt/default.nix | 43 | ||||
| -rw-r--r-- | fmt/metadata.nix | 4 | ||||
| -rw-r--r-- | nixpkgs-nixos-18.09/default.nix (renamed from nixpkgs/default.nix) | 0 | ||||
| -rw-r--r-- | nixpkgs-nixos-unstable/default.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/metadata.nix | 4 |
6 files changed, 43 insertions, 17 deletions
diff --git a/default.nix b/default.nix index 351ee05..6348b06 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,7 @@ self: super: let swaypkgs = { # patched deps - fmt = self.callPackage ./fmt { inherit self super; }; + fmt = self.callPackage ./fmt {}; # wlroots-related wlroots = self.callPackage ./wlroots {}; diff --git a/fmt/default.nix b/fmt/default.nix index 8f4a8d0..45f4581 100644 --- a/fmt/default.nix +++ b/fmt/default.nix @@ -1,15 +1,34 @@ -{ self, super }: +{ stdenv, fetchFromGitHub, cmake, enableShared ? true }: let - rev = "57ae5189351665715c98b3b6ca8595b30d83033f"; - sha256 = "1gy93mb1s1mq746kxj4c564k2mppqp5khqdfa6im88rv29cvrl4y"; + metadata = import ./metadata.nix; in - super.fmt.overrideAttrs (old: rec { - patches = [ - (self.pkgs.fetchpatch { - url = "https://github.com/fmtlib/fmt/pull/916/commits/${rev}.patch"; - sha256 = "${sha256}"; - }) - ]; - }) - +stdenv.mkDerivation rec { + version = metadata.rev; + name = "fmt-${version}"; + src = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = metadata.rev; + sha256 = metadata.sha256; + }; + nativeBuildInputs = [ cmake ]; + doCheck = true; + # preCheckHook ensures the test binaries can find libfmt.so.5 + preCheck = if enableShared + then "export LD_LIBRARY_PATH=\"$PWD\"" + else ""; + cmakeFlags = [ "-DFMT_TEST=yes" + "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ]; + meta = with stdenv.lib; { + homepage = http://fmtlib.net/; + description = "Small, safe and fast formatting library"; + longDescription = '' + fmt (formerly cppformat) is an open-source formatting library. It can be + used as a fast and safe alternative to printf and IOStreams. + ''; + maintainers = [ maintainers.jdehaas ]; + license = licenses.bsd2; + platforms = platforms.unix; + }; +} diff --git a/fmt/metadata.nix b/fmt/metadata.nix new file mode 100644 index 0000000..39ba6df --- /dev/null +++ b/fmt/metadata.nix @@ -0,0 +1,4 @@ +{ + rev = "36161284e246b400a7967df2de98cba1bf9f0fbe"; + sha256 = "0vwdk35mybhjd1xzy98i30v9ywaz6i31p2pjghbzl416jrswj3bx"; +} diff --git a/nixpkgs/default.nix b/nixpkgs-nixos-18.09/default.nix index 1d43220..1d43220 100644 --- a/nixpkgs/default.nix +++ b/nixpkgs-nixos-18.09/default.nix diff --git a/nixpkgs-nixos-unstable/default.nix b/nixpkgs-nixos-unstable/default.nix new file mode 100644 index 0000000..1d43220 --- /dev/null +++ b/nixpkgs-nixos-unstable/default.nix @@ -0,0 +1,7 @@ +let + meta = import ./metadata.nix; +in + builtins.fetchTarball { + url = "https://github.com/nixos/nixpkgs-channels/archive/${meta.rev}.tar.gz"; + sha256 = meta.sha256; + } diff --git a/nixpkgs/metadata.nix b/nixpkgs/metadata.nix deleted file mode 100644 index 8bd92c0..0000000 --- a/nixpkgs/metadata.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - rev = "c70ad805d216f18f91d2b0786b4ce248917153bb"; - sha256 = "0fn9flz870lgiwzvl64gwb9gy5ahhv4zsvkfh1khxf5jl4dwvjwv"; -} |