diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/bulletml | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/bulletml')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/bulletml/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/bulletml/default.nix b/nixpkgs/pkgs/development/libraries/bulletml/default.nix index 3da05302ac9f..8d562b58e24a 100644 --- a/nixpkgs/pkgs/development/libraries/bulletml/default.nix +++ b/nixpkgs/pkgs/development/libraries/bulletml/default.nix @@ -9,22 +9,25 @@ let sha256 = hash; }; -in stdenv.mkDerivation { + lib_src = fetchurl { + url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2"; + sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw"; + }; + + cpp_src = fetchurl { + url = "http://shinh.skr.jp/d/d_cpp.tar.bz2"; + sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh"; + }; +in + +stdenv.mkDerivation { pname = "bulletml"; inherit version; - srcs = [ - (fetchurl { - url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2"; - sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw"; - }) - (fetchurl { - url = "http://shinh.skr.jp/d/d_cpp.tar.bz2"; - sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh"; - }) - ]; - sourceRoot = "bulletml"; + srcs = [ lib_src cpp_src ]; + postUnpack = "mv d_cpp bulletml/"; + sourceRoot = "bulletml"; patches = [ (debianPatch "fixes" "0cnr968n0h50fjmjijx7idsa2pg2pv5cwy6nvfbkx9z8w2zf0mkl") |