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/gtdialog | |
| 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/gtdialog')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gtdialog/default.nix | 45 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gtdialog/default.upstream | 3 |
2 files changed, 21 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix index ac925477adb3..d7e60659a5ea 100644 --- a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix @@ -1,32 +1,29 @@ -{lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}: -let - s = # Generated upstream information - rec { - baseName="gtdialog"; - version="1.4"; - name="${baseName}-${version}"; - hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; - url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; - sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; +{ lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config }: + +stdenv.mkDerivation rec { + pname = "gtdialog"; + version = "1.4"; + + src = fetchurl { + url = "https://foicica.com/gtdialog/download/gtdialog_${version}.zip"; + sha256 = "sha256-0+WBr1IZIhQjxOsKO/yuXjaTRWPObhMdGqgibcpXGtI="; }; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - cdk gtk2 glib ncurses + cdk + gtk2 + glib + ncurses ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - makeFlags = ["PREFIX=$(out)"]; - meta = { - inherit (s) version; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { description = "Cross-platform helper for creating interactive dialogs"; - license = lib.licenses.mit ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "http://foicica.com/gtdialog"; downloadPage = "http://foicica.com/gtdialog/download"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtdialog/default.upstream b/nixpkgs/pkgs/development/libraries/gtdialog/default.upstream deleted file mode 100644 index b9cbcf4c5c75..000000000000 --- a/nixpkgs/pkgs/development/libraries/gtdialog/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://foicica.com/gtdialog/download -version_link '[.]zip$' -version '.*_([0-9.]*)[.]zip' '\1' |