diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-06 10:36:30 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-06 10:36:30 -0800 |
| commit | e680c8332361492027973af6d73eb8e5a8c6c5e2 (patch) | |
| tree | cc2ae3a47b2a022ff2a0e8bc03ec7cc4c3d8b485 /pkgs/tools/graphics | |
| parent | 46b79f9b46273490ef41636939d8781de5099432 (diff) | |
| parent | df68f3a71e458fb6b1c461d4278554acd8e32ec4 (diff) | |
| download | nixpkgs-e680c8332361492027973af6d73eb8e5a8c6c5e2.tar nixpkgs-e680c8332361492027973af6d73eb8e5a8c6c5e2.tar.gz nixpkgs-e680c8332361492027973af6d73eb8e5a8c6c5e2.tar.bz2 nixpkgs-e680c8332361492027973af6d73eb8e5a8c6c5e2.tar.lz nixpkgs-e680c8332361492027973af6d73eb8e5a8c6c5e2.tar.xz nixpkgs-e680c8332361492027973af6d73eb8e5a8c6c5e2.tar.zst nixpkgs-e680c8332361492027973af6d73eb8e5a8c6c5e2.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/tools/graphics/scrot/default.nix
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/scrot/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index bb721ded43a..11d2a3c0b89 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,14 +1,14 @@ { lib , stdenv , fetchFromGitHub +, imlib2 +, xlibsWrapper , autoreconfHook , autoconf-archive +, libXfixes +, libXcomposite , pkg-config -, imlib2 , libbsd -, libXcomposite -, libXfixes -, xlibsWrapper }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - hash = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY="; + sha256 = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY="; }; nativeBuildInputs = [ @@ -27,12 +27,13 @@ stdenv.mkDerivation rec { autoconf-archive pkg-config ]; + buildInputs = [ imlib2 - libbsd - libXcomposite - libXfixes xlibsWrapper + libXfixes + libXcomposite + libbsd ]; meta = with lib; { |