public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88624 from helsinki-systems/upd/gnustep

Browse Source 
gnustep: update
This commit is contained in:
Lassulus 2020-05-26 21:43:21 +02:00 committed by GitHub
commit 75e8502e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnustep/back/default.nix
View File

@ -8,13 +8,13 @@
, libXmu , libXmu
}: }:
let let
version = "0.27.0"; version = "0.28.0";
in in
gsmakeDerivation { gsmakeDerivation {
name = "gnustep-back-${version}"; name = "gnustep-back-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
sha256 = "0j400892ysxygh50i3918nn87vkxh15h892jwvphmkd34j8wdn9f"; sha256 = "1ynd27zwga17mp2qlym90k2xsypdvz24w6gyy2rfvmv0gkvlgrjr";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ];

4
pkgs/desktops/gnustep/base/default.nix
View File

@ -12,13 +12,13 @@
, libiberty , libiberty
}: }:
let let
version = "1.26.0"; version = "1.27.0";
in in
gsmakeDerivation { gsmakeDerivation {
name = "gnustep-base-${version}"; name = "gnustep-base-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz";
sha256 = "0ws16rwqx0qvqpyjsxbdylfpkgjr19nqc9i3b30wywqcqrkc12zn"; sha256 = "10xjrv5d443wzll6lf9y65p6v9kvx7xxklhsm1j05y93vwgzl0w8";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/desktops/gnustep/gorm/default.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, base, back, gsmakeDerivation, gui }: { fetchurl, base, back, gsmakeDerivation, gui }:
let let
version = "1.2.24"; version = "1.2.26";
in in
gsmakeDerivation { gsmakeDerivation {
name = "gorm-${version}"; name = "gorm-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz";
sha256 = "1jw7vm5ia7ias1mm5if7vvvb66q50zwiqw0ksj5g14f11v8l61rf"; sha256 = "063f8rlz8py931hfrh95jxvr68bzs33bvckfigzbagp73n892jnw";
}; };
buildInputs = [ base back gui ]; buildInputs = [ base back gui ];

4
pkgs/desktops/gnustep/gui/default.nix
View File

@ -1,12 +1,12 @@
{ gsmakeDerivation, fetchurl, base }: { gsmakeDerivation, fetchurl, base }:
let let
version = "0.27.0"; version = "0.28.0";
in in
gsmakeDerivation { gsmakeDerivation {
name = "gnustep-gui-${version}"; name = "gnustep-gui-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz";
sha256 = "1m6k3fa2ndxv0kl2fazi76mwa27gn5jyp24q0rk96f2djhsy94br"; sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z";
}; };
buildInputs = [ base ]; buildInputs = [ base ];
patches = [ ./fixup-all.patch ]; patches = [ ./fixup-all.patch ];

4
pkgs/desktops/gnustep/make/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, clang, which, libobjc }: { stdenv, fetchurl, clang, which, libobjc }:
let let
version = "2.7.0"; version = "2.8.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz";
sha256 = "1khiygfkz0zhh9b5nybn40g0xnnjxchk24n49hff1bwanszir84h"; sha256 = "0pfaylrr3xgn5026anmja4rv4l7nzzaqsrkxycyi0p4lvm12kklz";
}; };
configureFlags = [ configureFlags = [

4
pkgs/tools/archivers/unar/default.nix
View File

@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
substituteInPlace $f \ substituteInPlace $f \
--replace "= gcc" "=cc" \ --replace "= gcc" "=cc" \
--replace "= g++" "=c++" --replace "= g++" "=c++" \
--replace "-DGNU_RUNTIME=1" "" \
--replace "-fgnu-runtime" "-fobjc-nonfragile-abi"
done done
# we need to build inside this directory as well, so we have to make it writeable # we need to build inside this directory as well, so we have to make it writeable