diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-07-28 13:44:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-07-28 17:46:39 +0000 |
commit | cab13e087c80c4e7476bb7df432e2b7deb56563d (patch) | |
tree | f8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/tools/misc/xprite-editor/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | 8ecc61c91a596df7d3293603a9c2384190c1b89a (diff) | |
download | nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2 nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts: pkgs/applications/graphics/hello-wayland/default.nix pkgs/applications/virtualization/cloud-hypervisor/default.nix pkgs/applications/window-managers/tinywl/default.nix pkgs/applications/window-managers/wayfire/applications.nix pkgs/applications/window-managers/wayfire/default.nix pkgs/applications/window-managers/wayfire/wcm.nix pkgs/applications/window-managers/wayfire/wf-config.nix pkgs/applications/window-managers/wayfire/wf-shell.nix pkgs/development/libraries/wlroots/default.nix pkgs/os-specific/linux/chromium-os/crosvm/default.nix pkgs/os-specific/linux/kernel/common-config.nix pkgs/os-specific/linux/kernel/patches.nix pkgs/os-specific/linux/mdevd/default.nix pkgs/os-specific/linux/s6-linux-init/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/misc/xprite-editor/default.nix')
-rw-r--r-- | pkgs/tools/misc/xprite-editor/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix index 3f7e2e32294..fadeec41031 100644 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ b/pkgs/tools/misc/xprite-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , gtk3 @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk3 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.isLinux [ gtk3 ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; - cargoSha256 = "1a0zy8gfc1gdk8nnv5qr4yspqy1jsip5nql3w74rl6h46cplpf5y"; + cargoSha256 = "0z1ip667d1qwvm9md3zg8ib9jixpg7qj5ypwib7r2928h14yg7ck"; cargoBuildFlags = [ "--bin" "xprite-native" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rickyhan/xprite-editor"; description = "Pixel art editor"; license = licenses.gpl3; |