diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-24 18:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-24 18:01:06 +0000 |
| commit | adec6862c5640a01d93be9ecc38db505cd194d2e (patch) | |
| tree | 7fb64640f458aa615c2fe84f5e5184d186d770d7 /pkgs/desktops | |
| parent | 2a21328f7e0b751c6ec1f2539cb07dc8e85c8e43 (diff) | |
| parent | 612676d971b708fee42d0c2c2f1e3a3698c0e2e1 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnustep/make/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnustep/projectcenter/default.nix | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index e5c277e796afd..736635ab50269 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -1,7 +1,11 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup +providedPreConfigure="$preConfigure"; + preConfigure() { + eval "$providedPreConfigure" + . $GNUSTEP_MAKEFILES/GNUstep.sh } diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix index afe47c6cef70a..b535365b25d9f 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/desktops/gnustep/projectcenter/default.nix @@ -1,15 +1,19 @@ -{ fetchurl +{ lib, fetchFromGitHub , base, back, gsmakeDerivation, gui, gorm , gnumake, gdb }: let - version = "0.6.2"; + version = "0.7.0"; in gsmakeDerivation { - name = "projectcenter-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz"; - sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465"; + pname = "projectcenter"; + inherit version; + + src = fetchFromGitHub { + owner = "gnustep"; + repo = "apps-projectcenter"; + rev = "projectcenter-${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms="; }; # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: |