diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/jabcode | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/jabcode')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/jabcode/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/jabcode/default.nix b/nixpkgs/pkgs/development/libraries/jabcode/default.nix index 36c4c8c61c53..314a0cdf7eff 100644 --- a/nixpkgs/pkgs/development/libraries/jabcode/default.nix +++ b/nixpkgs/pkgs/development/libraries/jabcode/default.nix @@ -2,7 +2,9 @@ , fetchFromGitHub , lib , subproject ? "library" # one of "library", "reader" or "writer" -, zlib, libpng, libtiff +, zlib +, libpng +, libtiff , jabcode }: let @@ -11,9 +13,10 @@ let "reader" = "jabcodeReader"; "writer" = "jabcodeWriter"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "jabcode-${subproject}"; - version = "git-2020-05-13"; + version = "unstable-2020-05-13"; src = fetchFromGitHub { repo = "jabcode"; owner = "jabcode"; @@ -27,13 +30,14 @@ in stdenv.mkDerivation rec { preConfigure = "cd src/${subdir}"; - installPhase = if subproject == "library" then '' - mkdir -p $out/lib - cp build/* $out/lib - '' else '' - mkdir -p $out/bin - cp -RT bin $out/bin - ''; + installPhase = + if subproject == "library" then '' + mkdir -p $out/lib + cp build/* $out/lib + '' else '' + mkdir -p $out/bin + cp -RT bin $out/bin + ''; meta = with lib; { description = "A high-capacity 2D color bar code (${subproject})"; |